Skip to content

Commit dee6b7d

Browse files
torkelotorkelo
committed
Merge branch 'master' into getting-started-panel
2 parents 6ae6a5d + 924535c commit dee6b7d

File tree

129 files changed

+1977
-867
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+1977
-867
lines changed

‎CHANGELOG.md

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,53 @@
1-
# 4.0-stable (unrelased)
1+
# 4.1-beta (unreleased)
2+
3+
### Enhancements
4+
* **Postgres**: Add support for Certs for Postgres database [#6655](https://github.com/grafana/grafana/issues/6655)
5+
* **Victorops**: Add VictorOps notification integration [#6411](https://github.com/grafana/grafana/issues/6411)
6+
* **Opsgenie**: Add OpsGenie notification integratiion (by [@kylemcc](https://github.com/kylemcc)) [#6687](https://github.com/grafana/grafana/issues/6687)
7+
* **Singlestat**: New aggregation on singlestat panel [#6740](https://github.com/grafana/grafana/pull/6740)
8+
* **Cloudwatch**: Make it possible to specify access and secret key on the data source config page [#6697](https://github.com/grafana/grafana/issues/6697)
9+
* **Table**: Added Hidden Column Style for Table Panel [#5677](https://github.com/grafana/grafana/pull/5677)
10+
* **Graph**: Shared crosshair option renamed to shared tooltip, shows tooltip on all graphs as you hover over one graph. [#1578](https://github.com/grafana/grafana/pull/1578), [#6274](https://github.com/grafana/grafana/pull/6274)
11+
* **Elasticsearch**: Added support for Missing option (bucket) for terms aggregation [#4244](https://github.com/grafana/grafana/pull/4244), thx @shanielh
12+
13+
### Bugfixes
14+
* **API**: HTTP API for deleting org returning incorrect message for a non-existing org [#6679](https://github.com/grafana/grafana/issues/6679)
15+
* **Dashboard**: Posting empty dashboard result in corrupted dashboard [#5443](https://github.com/grafana/grafana/issues/5443)
16+
17+
# 4.0.2 (unreleased)
18+
19+
### Enhancements
20+
* **Playlist**: Add support for kiosk mode [#6727](https://github.com/grafana/grafana/issues/6727)
21+
22+
### Bugfixes
23+
* **Alerting**: Add alert message to webhook notifications [#6807](https://github.com/grafana/grafana/issues/6807)
24+
* **PNG Rendering**: Fix for server side rendering when using non default http addr bind and domain setting [#6813](https://github.com/grafana/grafana/issues/6813)
25+
* **PNG Rendering**: Fix for server side rendering when setting enforce_domain to true [#6769](https://github.com/grafana/grafana/issues/6769)
26+
* **Webhooks**: Add content type json to outgoing webhooks [#6822](https://github.com/grafana/grafana/issues/6822)
27+
* **Keyboard shortcut**: Fixed zoom out shortcut [#6837](https://github.com/grafana/grafana/issues/6837)
28+
* **Webdav**: Adds basic auth headers to webdav uploader [#6779](https://github.com/grafana/grafana/issues/6779)
29+
30+
# 4.0.1 (2016-12-02)
31+
32+
> **Notice**
33+
4.0.0 had serious connection pooling issue when using a data source in proxy access. This bug caused lots of resource issues
34+
due to too many connections/file handles on the data source backend. This problem is fixed in this release.
35+
36+
### Bugfixes
37+
* **Metrics**: Fixes nil pointer dereference on my arm build [#6749](https://github.com/grafana/grafana/issues/6749)
38+
* **Data proxy**: Fixes a tcp pooling issue in the datasource reverse proxy [#6759](https://github.com/grafana/grafana/issues/6759)
39+
40+
# 4.0-stable (2016-11-29)
241

342
### Bugfixes
443
* **Server-side rendering**: Fixed address used when rendering panel via phantomjs and using non default http_addr config [#6660](https://github.com/grafana/grafana/issues/6660)
544
* **Graph panel**: Fixed graph panel tooltip sort order issue [#6648](https://github.com/grafana/grafana/issues/6648)
645
* **Unsaved changes**: You now navigate to the intended page after saving in the unsaved changes dialog [#6675](https://github.com/grafana/grafana/issues/6675)
46+
* **TLS Client Auth**: Support for TLS client authentication for datasource proxies [#2316](https://github.com/grafana/grafana/issues/2316)
47+
* **Alerts out of sync**: Saving dashboards with broken alerts causes sync problem[#6576](https://github.com/grafana/grafana/issues/6576)
48+
* **Alerting**: Saving an alert with condition "HAS NO DATA" throws an error[#6701](https://github.com/grafana/grafana/issues/6701)
49+
* **Config**: Improve error message when parsing broken config file [#6731](https://github.com/grafana/grafana/issues/6731)
50+
* **Table**: Render empty dates as - instead of current date [#6728](https://github.com/grafana/grafana/issues/6728)
751

852
# 4.0-beta2 (2016-11-21)
953

@@ -19,6 +63,7 @@
1963
* **Singlestat**: Support repeated template variables in prefix/postfix [#6595](https://github.com/grafana/grafana/issues/6595)
2064
* **Templating**: Don't persist variable options with refresh option [#6586](https://github.com/grafana/grafana/issues/6586)
2165
* **Alerting**: Add ability to have OR conditions (and mixing AND & OR) [#6579](https://github.com/grafana/grafana/issues/6579)
66+
* **InfluxDB**: Fix for Ad-Hoc Filters variable & changing dashboards [#6821](https://github.com/grafana/grafana/issues/6821)
2267

2368
# 4.0-beta1 (2016-11-09)
2469

‎README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
1717
- [What's New in Grafana 2.1](http://docs.grafana.org/guides/whats-new-in-v2-1/)
1818
- [What's New in Grafana 2.5](http://docs.grafana.org/guides/whats-new-in-v2-5/)
1919
- [What's New in Grafana 3.0](http://docs.grafana.org/guides/whats-new-in-v3/)
20-
- [What's New in Grafana 4.0 Beta](http://docs.grafana.org/guides/whats-new-in-v4/)
20+
- [What's New in Grafana 4.0](http://docs.grafana.org/guides/whats-new-in-v4/)
2121

2222
## Features
2323
### Graphite Target Editor
@@ -79,7 +79,7 @@ the latest master builds [here](http://grafana.org/builds)
7979

8080
### Dependencies
8181

82-
- Go 1.7
82+
- Go 1.7.3
8383
- NodeJS v4+
8484

8585
### Get Code
@@ -155,10 +155,6 @@ If you have any idea for an improvement or found a bug do not hesitate to open a
155155
And if you have time clone this repo and submit a pull request and help me make Grafana
156156
the kickass metrics & devops dashboard we all dream about!
157157

158-
Before creating a pull request be sure that "grunt test" runs without any style or unit test errors, also
159-
please [sign the CLA](http://docs.grafana.org/project/cla/)
160-
161158
## License
162-
163159
Grafana is distributed under Apache 2.0 License.
164160
Work in progress Grafana 2.0 (with included Grafana backend)

‎circle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ machine:
55
GOPATH: "/home/ubuntu/.go_workspace"
66
ORG_PATH: "github.com/grafana"
77
REPO_PATH: "${ORG_PATH}/grafana"
8-
GODIST: "go1.7.3.linux-amd64.tar.gz"
8+
GODIST: "go1.7.4.linux-amd64.tar.gz"
99
post:
1010
- mkdir -p download
1111
- test -e download/$GODIST || curl -o download/$GODIST https://storage.googleapis.com/golang/$GODIST

‎conf/defaults.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ type = sqlite3
6767
host = 127.0.0.1:3306
6868
name = grafana
6969
user = root
70+
# If the password contains # or ; you have to wrap it with trippel quotes. Ex """#password;"""
7071
password =
7172
# Use either URL or the previous fields to configure the database
7273
# Example: mysql://user:secret@host:port/database
@@ -289,7 +290,7 @@ templates_pattern = emails/*.html
289290
[log]
290291
# Either "console", "file", "syslog". Default is console and file
291292
# Use space to separate multiple modes, e.g. "console file"
292-
mode = console, file
293+
mode = console file
293294

294295
# Either "debug", "info", "warn", "error", "critical", default is "info"
295296
level = info

‎conf/sample.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
;host = 127.0.0.1:3306
7070
;name = grafana
7171
;user = root
72+
# If the password contains # or ; you have to wrap it with trippel quotes. Ex """#password;"""
7273
;password =
7374

7475
# Use either URL or the previous fields to configure the database
@@ -272,7 +273,7 @@
272273
[log]
273274
# Either "console", "file", "syslog". Default is console and file
274275
# Use space to separate multiple modes, e.g. "console file"
275-
;mode = console, file
276+
;mode = console file
276277

277278
# Either "trace", "debug", "info", "warn", "error", "critical", default is "info"
278279
;level = info

‎docker/blocks/elastic5/elasticsearch.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
script.inline: on
2+
script.indexed: on

‎docker/blocks/elastic5/fig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
2+
3+
elasticsearch5:
4+
image: elasticsearch:5
5+
command: elasticsearch
6+
ports:
7+
- "9200:9200"
8+
- "9300:9300"

‎docs/sources/alerting/metrics.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
+++
2+
title = "Alerting Metrics"
3+
description = "Alerting Metrics Guide"
4+
keywords = ["Grafana", "alerting", "guide", "metrics"]
5+
type = "docs"
6+
[menu.docs]
7+
name = "Metrics"
8+
parent = "alerting"
9+
weight = 2
10+
+++
11+
12+
# Metrics from the alert engine
13+
14+
> Alerting is only available in Grafana v4.0 and above.
15+
16+
The alert engine publish some internal metrics about itself. You can read more about how Grafana published [interal metrics](/installation/configuration/#metrics)
17+
18+
Description | Type | Metric name
19+
---------- | ----------- | ----------
20+
Total number of alerts | counter | `alerting.active_alerts`
21+
Alert execution result | counter | `alerting.result`
22+
Notifications sent counter | counter | `alerting.notifications_sent`
23+
Alert execution timer | timer | `alerting.execution_time`

‎docs/sources/alerting/notifications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Auto resolve incidents | Resolve incidents in pagerduty once the alert goes back
9191

9292
# Enable images in notifications {#external-image-store}
9393

94-
Grafan can render the panel associated with the alert rule and include that in the notification. Some types
94+
Grafana can render the panel associated with the alert rule and include that in the notification. Some types
9595
of notifications require that this image be publicly accessable (Slack for example). In order to support
9696
images in notifications like Slack Grafana can upload the image to an image store. It currently supports
9797
Amazon S3 for this and Webdav. So to set that up you need to configure the

‎docs/sources/datasources/index.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,24 @@ parent = "features"
88
weight = 5
99
+++
1010

11+
# Data Source Overview
12+
Grafana supports many different storage backends for your time series data (Data Source). Each Data Source has a specific Query Editor that is customized for the features and capabilities that the particular Data Source exposes.
13+
14+
15+
## Querying
16+
The query language and capabilities of each Data Source are obviously very different. You can combine data from multiple Data Sources onto a single Dashboard, but each Panel is tied to a specific Data Source that belongs to a particular Organization.
17+
18+
## Supported Data Sources
19+
The following datasources are officially supported:
20+
21+
* [Graphite]({{< relref "graphite.md" >}})
22+
* [Elasticsearch]({{< relref "elasticsearch.md" >}})
23+
* [CloudWatch]({{< relref "cloudwatch.md" >}})
24+
* [InfluxDB]({{< relref "influxdb.md" >}})
25+
* [OpenTSDB]({{< relref "opentsdb.md" >}})
26+
* [Prometheus]({{< relref "prometheus.md" >}})
27+
28+
## Data source plugins
29+
30+
Since grafana 3.0 you can install data sources as plugins. Checkout [Grafana.net](https://grafana.net/plugins) for more data sources.
1131

‎docs/sources/datasources/overview.md

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎docs/sources/http_api/index.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,29 @@
11
+++
22
title = "HTTP API"
3+
description = "Grafana HTTP API"
4+
keywords = ["grafana", "http", "documentation", "api", "overview"]
5+
type = "docs"
36
[menu.docs]
47
name = "HTTP API"
58
identifier = "http_api"
69
weight = 9
710
+++
11+
12+
13+
# HTTP API Reference
14+
15+
The Grafana backend exposes an HTTP API, the same API is used by the frontend to do everything from saving
16+
dashboards, creating users and updating data sources.
17+
18+
## Supported HTTP APIs:
19+
20+
21+
* [Authentication API]({{< relref "auth.md" >}})
22+
* [Dashboard API]({{< relref "dashboard.md" >}})
23+
* [Data Source API]({{< relref "data_source.md" >}})
24+
* [Organisation API]({{< relref "org.md" >}})
25+
* [User API]({{< relref "user.md" >}})
26+
* [Admin API]({{< relref "admin.md" >}})
27+
* [Snapshot API]({{< relref "snapshot.md" >}})
28+
* [Preferences API]({{< relref "preferences.md" >}})
29+
* [Other API]({{< relref "other.md" >}})

‎docs/sources/http_api/overview.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎docs/sources/installation/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ The database user (not applicable for `sqlite3`).
170170

171171
### password
172172

173-
The database user's password (not applicable for `sqlite3`).
173+
The database user's password (not applicable for `sqlite3`). If the password contains `#` or `;` you have to wrap it with trippel quotes. Ex `"""#password;"""`
174174

175175
### ssl_mode
176176

‎docs/sources/installation/debian.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,16 @@ weight = 1
1414

1515
Description | Download
1616
------------ | -------------
17-
Stable for Debian-based Linux | [3.1.1 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.1-1470047149_amd64.deb)
18-
Latest Beta for Debian-based Linux | [4.0.0-beta2 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.0.0-1479719016beta2_amd64.deb)
17+
Stable for Debian-based Linux | [4.0.1 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.0.1-1480694114_amd64.deb)
1918

2019
## Install Stable
2120

2221
```
23-
$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.1-1470047149_amd64.deb
22+
$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.0.1-1480694114_amd64.deb
2423
$ sudo apt-get install -y adduser libfontconfig
25-
$ sudo dpkg -i grafana_3.1.1-1470047149_amd64.deb
24+
$ sudo dpkg -i grafana_4.0.1-1480694114_amd64.deb
2625
```
2726

28-
## Install Latest Beta
29-
30-
$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.0.0-1479719016beta2_amd64.deb
31-
$ sudo apt-get install -y adduser libfontconfig
32-
$ sudo dpkg -i grafana_4.0.0-1479719016beta2_amd64.deb
33-
3427
## APT Repository
3528

3629
Add the following line to your `/etc/apt/sources.list` file.

‎docs/sources/installation/rpm.md

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,24 @@ weight = 2
1414

1515
Description | Download
1616
------------ | -------------
17-
Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [3.1.1 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.1-1470047149.x86_64.rpm)
18-
Latest Beta for CentOS / Fedora / OpenSuse / Redhat Linux | [4.0.0-beta2 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.0-1479719016beta2.x86_64.rpm)
17+
Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.0.1 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.1-1480694114.x86_64.rpm)
1918

2019
## Install Stable
2120

2221
You can install Grafana using Yum directly.
2322

24-
$ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.1-1470047149.x86_64.rpm
23+
$ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.1-1480694114.x86_64.rpm
2524

2625
Or install manually using `rpm`.
2726

2827
#### On CentOS / Fedora / Redhat:
2928

3029
$ sudo yum install initscripts fontconfig
31-
$ sudo rpm -Uvh grafana-3.1.1-1470047149.x86_64.rpm
30+
$ sudo rpm -Uvh grafana-4.0.1-1480694114.x86_64.rpm
3231

3332
#### On OpenSuse:
3433

35-
$ sudo rpm -i --nodeps grafana-3.1.1-1470047149.x86_64.rpm
36-
37-
## Or Install Latest Beta
38-
39-
$ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.0-1479719016beta2.x86_64.rpm
40-
41-
Or install manually using `rpm`.
42-
43-
#### On CentOS / Fedora / Redhat:
44-
45-
$ sudo yum install initscripts fontconfig
46-
$ sudo rpm -Uvh grafana-4.0.0-1479719016beta2.x86_64.rpm
47-
48-
#### On OpenSuse:
49-
50-
$ sudo rpm -i --nodeps grafana-4.0.0-1479719016beta2.x86_64.rpm
34+
$ sudo rpm -i --nodeps grafana-4.0.1-1480694114.x86_64.rpm
5135

5236
## Install via YUM Repository
5337

‎docs/sources/installation/windows.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ weight = 3
1313

1414
Description | Download
1515
------------ | -------------
16-
Latest stable package for Windows | [grafana.3.1.1.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.1.windows-x64.zip)
17-
Latest beta package for Windows | [grafana.4.0.0-beta2.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.0-beta2.windows-x64.zip)
18-
16+
Latest stable package for Windows | [grafana.4.0.1.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.1.windows-x64.zip)
1917

2018
## Configure
2119

‎docs/sources/plugins/datasources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The Datasource should contain the following functions.
3737
```
3838
query(options) //used by panels to get data
3939
testDatasource() //used by datasource configuration page to make sure the connection is working
40-
annotationsQuery(options) // used dashboards to get annotations
40+
annotationsQuery(options) // used by dashboards to get annotations
4141
metricFindQuery(options) // used by query editor to get metric suggestions.
4242
```
4343

0 commit comments

Comments
 (0)