Skip to content

Commit 7294779

Browse files
author
Ryan Bak
committed
Merge remote-tracking branch 'upstream/master' into master-keystone
merge to pull the v4 beta tag
2 parents 00a5232 + b824fa1 commit 7294779

File tree

120 files changed

+2073
-745
lines changed

Some content is hidden

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

120 files changed

+2073
-745
lines changed

CHANGELOG.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
# 4.0-pre (unreleased)
1+
# 4.0-beta2 (unrelased)
2+
3+
### Bugfixes
4+
* **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)
5+
* **Graph Panel**: Bar width if bars was only used in series override, [#6528](https://github.com/grafana/grafana/issues/6528)
6+
* **UI/Browser**: Fixed issue with page/view header gradient border not showing in Safari, [#6530](https://github.com/grafana/grafana/issues/6530)
7+
8+
# 4.0-beta1 (2016-11-09)
29

310
### Enhancements
411
* **Login**: Adds option to disable username/password logins, closes [#4674](https://github.com/grafana/grafana/issues/4674)
@@ -14,15 +21,17 @@
1421
* **OpenTSDB**: Add support for explicitTags for OpenTSDB>=2.3, closes [#6360](https://github.com/grafana/grafana/pull/6361)
1522
* **OAuth**: Add support for generic oauth, closes [#4718](https://github.com/grafana/grafana/pull/4718)
1623
* **Cloudwatch**: Add support to expand multi select template variable, closes [#5003](https://github.com/grafana/grafana/pull/5003)
17-
* **Graph Panel**: Now supports flexible lower/upper bounds on Y-Max and Y-Min, PR [#5720](https://github.com/grafana/grafana/pull/5720)
1824
* **Background Tasks**: Now support automatic purging of old snapshots, closes [#4087](https://github.com/grafana/grafana/issues/4087)
1925
* **Background Tasks**: Now support automatic purging of old rendered images, closes [#2172](https://github.com/grafana/grafana/issues/2172)
26+
* **Dashboard**: After inactivity hide nav/row actions, fade to nice clean view, can be toggled with `d v`, also added kiosk mode, toggled via `d k` [#6476](https://github.com/grafana/grafana/issues/6476)
27+
* **Dashboard**: Improved dashboard row menu & add panel UX [#6442](https://github.com/grafana/grafana/issues/6442)
28+
* **Graph Panel**: Support for stacking null values [#2912](https://github.com/grafana/grafana/issues/2912), [#6287](https://github.com/grafana/grafana/issues/6287), thanks @benrubson!
2029

2130
### Breaking changes
2231
* **SystemD**: Change systemd description, closes [#5971](https://github.com/grafana/grafana/pull/5971)
2332
* **lodash upgrade**: Upgraded lodash from 2.4.2 to 4.15.0, this contains a number of breaking changes that could effect plugins. closes [#6021](https://github.com/grafana/grafana/pull/6021)
2433

25-
### Bugfixes
34+
### Bug fixes
2635
* **Table Panel**: Fixed problem when switching to Mixed datasource in metrics tab, fixes [#5999](https://github.com/grafana/grafana/pull/5999)
2736
* **Playlist**: Fixed problem with play order not matching order defined in playlist, fixes [#5467](https://github.com/grafana/grafana/pull/5467)
2837
* **Graph panel**: Fixed problem with auto decimals on y axis when datamin=datamax, fixes [#6070](https://github.com/grafana/grafana/pull/6070)
@@ -31,6 +40,7 @@
3140
* **Elasticsearch**: Fix for displaying IP address used in terms aggregations, fixes [#4393](https://github.com/grafana/grafana/pull/4393)
3241
* **PNG Rendering**: Fix for server side rendering when using auth proxy, fixes [#5906](https://github.com/grafana/grafana/pull/5906)
3342
* **OpenTSDB**: Fixed multi-value nested templating for opentsdb, fixes [#6455](https://github.com/grafana/grafana/pull/6455)
43+
* **Playlist**: Remove playlist items when dashboard is removed, fixes [#6292](https://github.com/grafana/grafana/issues/6292)
3444

3545
# 3.1.2 (unreleased)
3646
* **Templating**: Fixed issue when combining row & panel repeats, fixes [#5790](https://github.com/grafana/grafana/issues/5790)

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.1.linux-amd64.tar.gz"
8+
GODIST: "go1.7.3.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: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ auth_url = https://accounts.google.com/o/oauth2/auth
229229
token_url = https://accounts.google.com/o/oauth2/token
230230
api_url = https://www.googleapis.com/oauth2/v1/userinfo
231231
allowed_domains =
232-
hosted_domain =
232+
hosted_domain =
233233

234234
#################################### Grafana.net Auth ####################
235235
[auth.grafananet]
@@ -404,21 +404,6 @@ global_api_key = -1
404404
global_session = -1
405405

406406
#################################### Alerting ############################
407-
# docs about alerting can be found in /docs/sources/alerting/
408-
# __.-/|
409-
# \`o_O'
410-
# =( )= +----------------------------+
411-
# U| | Alerting is still in alpha |
412-
# /\ /\ / | +----------------------------+
413-
# ) /^\) ^\/ _)\ |
414-
# ) /^\/ _) \ |
415-
# ) _ / / _) \___|_
416-
# /\ )/\/ || | )_)\___,|))
417-
# < > |(,,) )__) |
418-
# || / \)___)\
419-
# | \____( )___) )____
420-
# \______(_______;;;)__;;;)
421-
422407
[alerting]
423408
# Makes it possible to turn off alert rule execution.
424409
execute_alerts = true

conf/sample.ini

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -354,21 +354,6 @@
354354
;path = /var/lib/grafana/dashboards
355355

356356
#################################### Alerting ######################################
357-
# docs about alerting can be found in /docs/sources/alerting/
358-
# __.-/|
359-
# \`o_O'
360-
# =( )= +----------------------------+
361-
# U| | Alerting is still in alpha |
362-
# /\ /\ / | +----------------------------+
363-
# ) /^\) ^\/ _)\ |
364-
# ) /^\/ _) \ |
365-
# ) _ / / _) \___|_
366-
# /\ )/\/ || | )_)\___,|))
367-
# < > |(,,) )__) |
368-
# || / \)___)\
369-
# | \____( )___) )____
370-
# \______(_______;;;)__;;;)
371-
372357
[alerting]
373358
# Makes it possible to turn off alert rule execution.
374359
;execute_alerts = true

docker/blocks/elastic/fig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch:
2-
image: elasticsearch:latest
2+
image: elasticsearch:2.4.1
33
command: elasticsearch -Des.network.host=0.0.0.0
44
ports:
55
- "9200:9200"

docs/sources/alerting/alerting.md

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

docs/sources/alerting/index.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
+++
2+
title = "Alerting"
3+
type = "docs"
4+
[menu.docs]
5+
identifier = "alerting"
6+
parent = "features"
7+
weight = 6
8+
+++
9+
Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
+++
2+
title = "Alerting Notifications"
3+
description = "Alerting Notifications Guide"
4+
keywords = ["Grafana", "alerting", "guide", "notifications"]
5+
type = "docs"
6+
[menu.docs]
7+
name = "Notifications"
8+
parent = "alerting"
9+
weight = 2
10+
+++
11+
12+
13+
# Alert Notifications
14+
15+
{{< imgbox max-width="40%" img="/img/docs/v4/alert_notifications_menu.png" caption="Alerting notifications" >}}
16+
17+
> Alerting is only available in Grafana v4.0 and above.
18+
19+
When an alert changes state it sends out notifications. Each alert rule can have
20+
multiple notifications. But in order to add a notification to an alert rule you first need
21+
to add and configure a `notification` object. This is done from the Alerting/Notifications page.
22+
23+
## Notification Setup
24+
25+
On the notifications list page hit the `New Notification` button to go the the page where you
26+
can configure and setup a new notification.
27+
28+
You specify name and type, and type specific options. You can also test the notification to make
29+
sure it's working and setup correctly.
30+
31+
### Send on all alerts
32+
33+
When checked this option will make this notification used for all alert rules, existing and new.
34+
35+
## Supported notification types
36+
37+
Grafana ships with a set of notification types. More will be added in future releases.
38+
39+
### Email
40+
41+
To enable email notification you have to setup [SMTP settings](/installation/configuration/#smtp)
42+
in the Grafana config. Email notification will upload an image of the alert graph to an
43+
external image destination if available or fallback on attaching the image in the email.
44+
45+
### Slack
46+
47+
{{< imgbox max-width="40%" img="/img/docs/v4/slack_notification.png" caption="Alerting Slack Notification" >}}
48+
49+
To set up slack you need to configure an incoming webhook url at slack. You can follow their guide for how
50+
to do that https://api.slack.com/incoming-webhooks If you want to include screenshots of the firing alerts
51+
in the slack messages you have to configure the [external image destination](#external-image-store) in Grafana.
52+
53+
Setting | Description
54+
---------- | -----------
55+
Recipient | allows you to override the slack recipient.
56+
Mention | make it possible to include a mention in the slack notification sent by Grafana. Ex @here or @channel
57+
58+
### Webhook
59+
60+
The webhook notification is a simple way to send information about an state change over HTTP to a custom endpoint.
61+
Using this notification you could integrated Grafana into any system you choose, by yourself.
62+
63+
Example json body:
64+
```json
65+
{
66+
"title": "My alert",
67+
"ruleId": 1,
68+
"ruleName": "Load peaking!",
69+
"ruleUrl": "http://url.to.grafana/db/dashboard/my_dashboard?panelId=2",
70+
"state": "Alerting",
71+
"imageUrl": "http://s3.image.url",
72+
"evalMatches": [
73+
{
74+
"metric": "requests",
75+
"tags": {},
76+
"value": 122
77+
}
78+
]
79+
}
80+
```
81+
82+
### PagerDuty
83+
84+
To set up PagerDuty, all you have to do is to provide an api key.
85+
86+
Setting | Description
87+
---------- | -----------
88+
Integration Key | Integration key for pagerduty.
89+
Auto resolve incidents | Resolve incidents in pagerduty once the alert goes back to ok
90+
91+
92+
# Enable images in notifications {#external-image-store}
93+
94+
Grafan can render the panel associated with the alert rule and include that in the notification. Some types
95+
of notifications require that this image be publicly accessable (Slack for example). In order to support
96+
images in notifications like Slack Grafana can upload the image to an image store. It currently supports
97+
Amazon S3 for this and Webdav. So to set that up you need to configure the
98+
[external image uploader](/installation/configuration/#external-image-storage) in your grafana-server ini
99+
config file.
100+
101+
This is not an optional requirement, you can get slack and email notifications without setting this up.
102+
103+

0 commit comments

Comments
 (0)