Skip to content

Commit 99e3db8

Browse files
bergquistbergquist
committed
Merge branch 'master' into alerting_mqe
2 parents 1b0005a + 46c161b commit 99e3db8

File tree

1,249 files changed

+36307
-767656
lines changed

Some content is hidden

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

1,249 files changed

+36307
-767656
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
* **I'm submitting a ...**
2-
- [ ] Bug report
3-
- [ ] Feature request
4-
- [ ] Question / Support request: **Please do not** open a github issue. [Support Options](http://grafana.org/support/)
1+
Please prefix your title with [Bug] or [Feature request]
2+
For question please check [Support Options](http://grafana.org/support/). **Do not** open a github issue
53

64
Please include this information:
75
- What Grafana version are you using?
@@ -11,7 +9,10 @@ Please include this information:
119
- What was the expected result?
1210
- What happened instead?
1311

14-
**IMPORTANT** If it relates to metric data viz:
12+
**IMPORTANT**
13+
If it relates to *metric data viz*:
1514
- An image or text representation of your metric query
1615
- The raw query and response for the network request (check this in chrome dev tools network tab, here you can see metric requests and other request, please include the request body and request response)
1716

17+
If it relates to *alerting*
18+
- An image of the test execution data fully expanded.

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
* Link the PR to an issue for new features
2-
* Rebase your PR if it gets out of sync with master
2+
* Rebase your PR if it gets out of sync with master
3+
4+
**REMOVE THE TEXT ABOVE BEFORE CREATING THE PULL REQUST**

‎CHANGELOG.md

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,73 @@
1-
# 4.0-beta2 (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), thx [@ichekrygin](https://github.com/ichekrygin)
6+
* **Opsgenie**: Add OpsGenie notification integratiion [#6687](https://github.com/grafana/grafana/issues/6687), thx [@kylemcc](https://github.com/kylemcc)
7+
* **Singlestat**: New aggregation on singlestat panel [#6740](https://github.com/grafana/grafana/pull/6740), thx [@dirk-leroux](https://github.com/dirk-leroux)
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), thx [@bmundt](https://github.com/bmundt)
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](https://github.com/shanielh)
12+
* **Elasticsearch**: Added support for Elasticsearch 5.x [#6356](https://github.com/grafana/grafana/pull/6356), thx [@lpic10](https://github.com/lpic10)
13+
* **CLI**: Make it possible to reset the admin password using the grafana-cli. [#5479](https://github.com/grafana/grafana/issues/5479)
14+
* **Influxdb**: Support multiple tags in InfluxDB annotations. [#4550](https://github.com/grafana/grafana/pull/4550)
15+
16+
### Bugfixes
17+
* **API**: HTTP API for deleting org returning incorrect message for a non-existing org [#6679](https://github.com/grafana/grafana/issues/6679)
18+
* **Dashboard**: Posting empty dashboard result in corrupted dashboard [#5443](https://github.com/grafana/grafana/issues/5443)
19+
20+
# 4.0.2 (2016-12-08)
21+
22+
### Enhancements
23+
* **Playlist**: Add support for kiosk mode [#6727](https://github.com/grafana/grafana/issues/6727)
24+
25+
### Bugfixes
26+
* **Alerting**: Add alert message to webhook notifications [#6807](https://github.com/grafana/grafana/issues/6807)
27+
* **Alerting**: Fixes a bug where avg() reducer treated null as zero. [#6879](https://github.com/grafana/grafana/issues/6879)
28+
* **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)
29+
* **PNG Rendering**: Fix for server side rendering when setting enforce_domain to true [#6769](https://github.com/grafana/grafana/issues/6769)
30+
* **Webhooks**: Add content type json to outgoing webhooks [#6822](https://github.com/grafana/grafana/issues/6822)
31+
* **Keyboard shortcut**: Fixed zoom out shortcut [#6837](https://github.com/grafana/grafana/issues/6837)
32+
* **Webdav**: Adds basic auth headers to webdav uploader [#6779](https://github.com/grafana/grafana/issues/6779)
33+
34+
# 4.0.1 (2016-12-02)
35+
36+
> **Notice**
37+
4.0.0 had serious connection pooling issue when using a data source in proxy access. This bug caused lots of resource issues
38+
due to too many connections/file handles on the data source backend. This problem is fixed in this release.
39+
40+
### Bugfixes
41+
* **Metrics**: Fixes nil pointer dereference on my arm build [#6749](https://github.com/grafana/grafana/issues/6749)
42+
* **Data proxy**: Fixes a tcp pooling issue in the datasource reverse proxy [#6759](https://github.com/grafana/grafana/issues/6759)
43+
44+
# 4.0-stable (2016-11-29)
45+
46+
### Bugfixes
47+
* **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)
48+
* **Graph panel**: Fixed graph panel tooltip sort order issue [#6648](https://github.com/grafana/grafana/issues/6648)
49+
* **Unsaved changes**: You now navigate to the intended page after saving in the unsaved changes dialog [#6675](https://github.com/grafana/grafana/issues/6675)
50+
* **TLS Client Auth**: Support for TLS client authentication for datasource proxies [#2316](https://github.com/grafana/grafana/issues/2316)
51+
* **Alerts out of sync**: Saving dashboards with broken alerts causes sync problem[#6576](https://github.com/grafana/grafana/issues/6576)
52+
* **Alerting**: Saving an alert with condition "HAS NO DATA" throws an error[#6701](https://github.com/grafana/grafana/issues/6701)
53+
* **Config**: Improve error message when parsing broken config file [#6731](https://github.com/grafana/grafana/issues/6731)
54+
* **Table**: Render empty dates as - instead of current date [#6728](https://github.com/grafana/grafana/issues/6728)
55+
56+
# 4.0-beta2 (2016-11-21)
257

358
### Bugfixes
459
* **Graph Panel**: Log base scale on right Y-axis had no effect, max value calc was not applied, [#6534](https://github.com/grafana/grafana/issues/6534)
560
* **Graph Panel**: Bar width if bars was only used in series override, [#6528](https://github.com/grafana/grafana/issues/6528)
661
* **UI/Browser**: Fixed issue with page/view header gradient border not showing in Safari, [#6530](https://github.com/grafana/grafana/issues/6530)
62+
* **Cloudwatch**: Fixed cloudwatch datasource requesting to many datapoints, [#6544](https://github.com/grafana/grafana/issues/6544)
763
* **UX**: Panel Drop zone visible after duplicating panel, and when entering fullscreen/edit view, [#6598](https://github.com/grafana/grafana/issues/6598)
64+
* **Templating**: Newly added variable was not visible directly only after dashboard reload, [#6622](https://github.com/grafana/grafana/issues/6622)
865

966
### Enhancements
1067
* **Singlestat**: Support repeated template variables in prefix/postfix [#6595](https://github.com/grafana/grafana/issues/6595)
68+
* **Templating**: Don't persist variable options with refresh option [#6586](https://github.com/grafana/grafana/issues/6586)
69+
* **Alerting**: Add ability to have OR conditions (and mixing AND & OR) [#6579](https://github.com/grafana/grafana/issues/6579)
70+
* **InfluxDB**: Fix for Ad-Hoc Filters variable & changing dashboards [#6821](https://github.com/grafana/grafana/issues/6821)
1171

1272
# 4.0-beta1 (2016-11-09)
1373

‎README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +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](http://docs.grafana.org/guides/whats-new-in-v4/)
2021

2122
## Features
2223
### Graphite Target Editor
@@ -78,7 +79,7 @@ the latest master builds [here](http://grafana.org/builds)
7879

7980
### Dependencies
8081

81-
- Go 1.7
82+
- Go 1.7.3
8283
- NodeJS v4+
8384

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

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

‎build.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ func main() {
7373
case "setup":
7474
setup()
7575

76+
case "build-cli":
77+
clean()
78+
build("grafana-cli", "./pkg/cmd/grafana-cli", []string{})
79+
7680
case "build":
7781
clean()
7882
for _, binary := range binaries {

‎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: 6 additions & 5 deletions
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
@@ -208,7 +209,7 @@ org_role = Viewer
208209
#################################### Github Auth #########################
209210
[auth.github]
210211
enabled = false
211-
allow_sign_up = false
212+
allow_sign_up = true
212213
client_id = some_id
213214
client_secret = some_secret
214215
scopes = user:email
@@ -221,7 +222,7 @@ allowed_organizations =
221222
#################################### Google Auth #########################
222223
[auth.google]
223224
enabled = false
224-
allow_sign_up = false
225+
allow_sign_up = true
225226
client_id = some_client_id
226227
client_secret = some_client_secret
227228
scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
@@ -234,7 +235,7 @@ hosted_domain =
234235
#################################### Grafana.net Auth ####################
235236
[auth.grafananet]
236237
enabled = false
237-
allow_sign_up = false
238+
allow_sign_up = true
238239
client_id = some_id
239240
client_secret = some_secret
240241
scopes = user:email
@@ -243,7 +244,7 @@ allowed_organizations =
243244
#################################### Generic OAuth #######################
244245
[auth.generic_oauth]
245246
enabled = false
246-
allow_sign_up = false
247+
allow_sign_up = true
247248
client_id = some_id
248249
client_secret = some_secret
249250
scopes = user:email
@@ -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: 6 additions & 5 deletions
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
@@ -193,7 +194,7 @@
193194
#################################### Github Auth ##########################
194195
[auth.github]
195196
;enabled = false
196-
;allow_sign_up = false
197+
;allow_sign_up = true
197198
;client_id = some_id
198199
;client_secret = some_secret
199200
;scopes = user:email,read:org
@@ -206,7 +207,7 @@
206207
#################################### Google Auth ##########################
207208
[auth.google]
208209
;enabled = false
209-
;allow_sign_up = false
210+
;allow_sign_up = true
210211
;client_id = some_client_id
211212
;client_secret = some_client_secret
212213
;scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
@@ -218,7 +219,7 @@
218219
#################################### Generic OAuth ##########################
219220
[auth.generic_oauth]
220221
;enabled = false
221-
;allow_sign_up = false
222+
;allow_sign_up = true
222223
;client_id = some_id
223224
;client_secret = some_secret
224225
;scopes = user:email,read:org
@@ -231,7 +232,7 @@
231232
#################################### Grafana.net Auth ####################
232233
[auth.grafananet]
233234
;enabled = false
234-
;allow_sign_up = false
235+
;allow_sign_up = true
235236
;client_id = some_id
236237
;client_secret = some_secret
237238
;scopes = user:email
@@ -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/elastic1/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/elastic1/fig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
elasticsearch1:
2+
image: elasticsearch:1.7.6
3+
command: elasticsearch -Des.network.host=0.0.0.0
4+
ports:
5+
- "11200:9200"
6+
- "11300:9300"
7+
volumes:
8+
- ./blocks/elastic/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml

‎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+
- "10200:9200"
8+
- "10300: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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ Example json body:
6969
"ruleUrl": "http://url.to.grafana/db/dashboard/my_dashboard?panelId=2",
7070
"state": "Alerting",
7171
"imageUrl": "http://s3.image.url",
72+
"message": "Load is peaking. Make sure the traffic is real and spin up more webfronts",
7273
"evalMatches": [
7374
{
7475
"metric": "requests",
@@ -91,7 +92,7 @@ Auto resolve incidents | Resolve incidents in pagerduty once the alert goes back
9192

9293
# Enable images in notifications {#external-image-store}
9394

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

‎docs/sources/alerting/rules.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ Currently the only condition type that exists is a `Query` condition that allows
5555
specify a query letter, time range and an aggregation function. The letter refers to
5656
a query you already have added in the **Metrics** tab. The result from the query and the aggregation function is
5757
a single value that is then used in the threshold check. The query used in an alert rule cannot
58-
contain any template variables. Currently we only support `AND` operator between conditions.
58+
contain any template variables. Currently we only support `AND` and `OR` operators between conditions and they are executed serially.
59+
For example, we have 3 conditions in the following order:
60+
`condition:A(evaluates to: TRUE) OR condition:B(evaluates to: FALSE) AND condition:C(evaluates to: TRUE)`
61+
so the result will be calculated as ((TRUE OR FALSE) AND TRUE) = TRUE.
5962

6063
We plan to add other condition types in the future, like `Other Alert`, where you can include the state
6164
of another alert in your conditions, and `Time Of Day`.

‎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/influxdb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ the hosts variable only show hosts from the current selected region with a query
116116
SHOW TAG VALUES WITH KEY = "hostname" WHERE region =~ /$region/
117117
```
118118

119-
> Always you `regex values` or `regex wildcard` for All format or multi select format.
119+
> Always use `regex values` or `regex wildcard` for All format or multi select format.
120120
121121
![](/img/docs/influxdb/templating_simple_ex1.png)
122122

‎docs/sources/datasources/overview.md

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

0 commit comments

Comments
 (0)