-
+
-
-
-
+
+
+
+
+
+
+
+
+ {{> body }}
-
+
+
+
-
diff --git a/emails/templates/new_user_invite.html b/emails/templates/new_user_invite.html
index 86948a665f6..6e75a203953 100644
--- a/emails/templates/new_user_invite.html
+++ b/emails/templates/new_user_invite.html
@@ -9,7 +9,7 @@
- You're invited to join [[.OrgName]]
+ You're invited to join [[.OrgName]]
@@ -25,7 +25,7 @@
- You've been invited to join the [[.OrgName]] organization by [[.InvitedBy]] . To accept your invitation and join the team, please click the link below:
+ You've been invited to join the [[.OrgName]] organization by [[.InvitedBy]] . To accept your invitation and join the team, please click the link below:
diff --git a/emails/templates/reset_password.html b/emails/templates/reset_password.html
index f3aca5da95e..e9d1527116c 100644
--- a/emails/templates/reset_password.html
+++ b/emails/templates/reset_password.html
@@ -7,7 +7,7 @@
- Hi [[.Name]]
+ Hi [[.Name]],
@@ -24,7 +24,7 @@
- Please click the following link to reset your password within [[.EmailCodeValidHours]] hours .
+ Please click the following link to reset your password within [[.EmailCodeValidHours]] hours .
[[.AppUrl]]user/password/reset?code=[[.Code]]
diff --git a/emails/templates/signup_started.html b/emails/templates/signup_started.html
index 39b369a1f7c..15689a0e62c 100644
--- a/emails/templates/signup_started.html
+++ b/emails/templates/signup_started.html
@@ -7,7 +7,7 @@
- Complete the signup
+ Complete the signup
diff --git a/emails/templates/welcome_on_signup.html b/emails/templates/welcome_on_signup.html
index b93c56b77b1..0e0e4dbe3bc 100644
--- a/emails/templates/welcome_on_signup.html
+++ b/emails/templates/welcome_on_signup.html
@@ -7,10 +7,15 @@
- Hi [[.Name]]
+ Hi [[.Name]],
+
+
+ Welcome! Ready to start building some beautiful metric and analytic dashboards?
+
+
@@ -29,6 +34,13 @@
+
+ Thank you for joining our community.
+ The Grafana Team
+
+
diff --git a/examples/README.md b/examples/README.md
index 64341a7fdbc..75f1f9a9a86 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -1,4 +1,5 @@
## Example plugin implementations
datasource:[simple-json-datasource](https://github.com/grafana/simple-json-datasource)
-app: [example-app](https://github.com/grafana/example-app)
\ No newline at end of file
+app: [example-app](https://github.com/grafana/example-app)
+panel: [grafana-piechart-panel](https://github.com/grafana/piechart-panel)
diff --git a/examples/alerting-dashboard.json b/examples/alerting-dashboard.json
new file mode 100644
index 00000000000..744460d7847
--- /dev/null
+++ b/examples/alerting-dashboard.json
@@ -0,0 +1,800 @@
+{
+ "__inputs": [
+ {
+ "name": "DS_GRAPHITE",
+ "label": "graphite",
+ "description": "",
+ "type": "datasource",
+ "pluginId": "graphite",
+ "pluginName": "Graphite"
+ }
+ ],
+ "__requires": [
+ {
+ "type": "panel",
+ "id": "graph",
+ "name": "Graph",
+ "version": ""
+ },
+ {
+ "type": "grafana",
+ "id": "grafana",
+ "name": "Grafana",
+ "version": "3.1.0"
+ },
+ {
+ "type": "datasource",
+ "id": "graphite",
+ "name": "Graphite",
+ "version": "1.0.0"
+ }
+ ],
+ "id": null,
+ "title": "Alerting example",
+ "tags": [],
+ "style": "dark",
+ "timezone": "browser",
+ "editable": true,
+ "hideControls": false,
+ "sharedCrosshair": false,
+ "rows": [
+ {
+ "collapse": false,
+ "editable": true,
+ "height": "250px",
+ "panels": [
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 355
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "60s",
+ "handler": 1,
+ "name": "Critical alert panel",
+ "notifications": [],
+ "severity": "critical"
+ },
+ "alerting": {},
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "grid": {},
+ "id": 1,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 4,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ },
+ {
+ "refId": "B",
+ "target": "aliasByNode(scale(statsd.$apa.counters.session_start.*.count, 10), 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "line": true,
+ "op": "gt",
+ "value": 355
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Critical panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 20
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "60s",
+ "handler": 1,
+ "name": "Warning panel alert",
+ "notifications": [],
+ "severity": "warning"
+ },
+ "alerting": {},
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 2,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 4,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "warning",
+ "fill": true,
+ "fillColor": "rgba(235, 138, 14, 0.12)",
+ "line": true,
+ "lineColor": "rgba(247, 149, 32, 0.60)",
+ "op": "gt",
+ "value": 20
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Warning panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 1
+ ],
+ "type": "lt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "count"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "60s",
+ "handler": 1,
+ "name": "No datapoints",
+ "notifications": [],
+ "severity": "critical"
+ },
+ "alerting": {},
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 20,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 4,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "value": 1,
+ "op": "lt",
+ "fill": true,
+ "line": true,
+ "colorMode": "critical"
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Count datapoints",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ }
+ ],
+ "title": "Row"
+ },
+ {
+ "collapse": false,
+ "editable": true,
+ "height": "250px",
+ "panels": [
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 20
+ ],
+ "type": "lt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "60s",
+ "handler": 1,
+ "name": "Alert below value",
+ "notifications": [],
+ "severity": "critical"
+ },
+ "alerting": {},
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 17,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "line": true,
+ "lineColor": "rgba(237, 46, 24, 0.60)",
+ "op": "lt",
+ "value": 20
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Alert below value",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 10,
+ 80
+ ],
+ "type": "outside_range"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "10s",
+ "handler": 1,
+ "name": "Alert is outside range",
+ "notifications": [],
+ "severity": "critical"
+ },
+ "alerting": {},
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 18,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "line": true,
+ "lineColor": "rgba(237, 46, 24, 0.60)",
+ "op": "lt",
+ "value": 10
+ },
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "line": true,
+ "lineColor": "rgba(237, 46, 24, 0.60)",
+ "op": "gt",
+ "value": 80
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Alert is outside range",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 60,
+ 80
+ ],
+ "type": "within_range"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "10s",
+ "handler": 1,
+ "name": "Alert is within range",
+ "notifications": [],
+ "severity": "critical"
+ },
+ "alerting": {},
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 19,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "line": true,
+ "lineColor": "rgba(237, 46, 24, 0.60)",
+ "op": "gt",
+ "value": 60
+ },
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "line": true,
+ "lineColor": "rgba(237, 46, 24, 0.60)",
+ "op": "lt",
+ "value": 80
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Alert is within range",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ }
+ ],
+ "title": "New row"
+ }
+ ],
+ "time": {
+ "from": "now-6h",
+ "to": "now"
+ },
+ "timepicker": {
+ "refresh_intervals": [
+ "5s",
+ "10s",
+ "30s",
+ "1m",
+ "5m",
+ "15m",
+ "30m",
+ "1h",
+ "2h",
+ "1d"
+ ],
+ "time_options": [
+ "5m",
+ "15m",
+ "1h",
+ "6h",
+ "12h",
+ "24h",
+ "2d",
+ "7d",
+ "30d"
+ ]
+ },
+ "templating": {
+ "list": [
+ {
+ "current": {
+ "text": "fakesite",
+ "value": "fakesite"
+ },
+ "datasource": null,
+ "hide": 0,
+ "includeAll": false,
+ "multi": false,
+ "name": "apa",
+ "options": [
+ {
+ "selected": true,
+ "text": "fakesite",
+ "value": "fakesite"
+ }
+ ],
+ "query": "fakesite",
+ "refresh": 0,
+ "type": "custom"
+ }
+ ]
+ },
+ "annotations": {
+ "list": []
+ },
+ "schemaVersion": 13,
+ "version": 15,
+ "links": [],
+ "gnetId": null
+}
\ No newline at end of file
diff --git a/examples/alerting-multiple-alerts.json b/examples/alerting-multiple-alerts.json
new file mode 100644
index 00000000000..e6e729ecc06
--- /dev/null
+++ b/examples/alerting-multiple-alerts.json
@@ -0,0 +1,2216 @@
+{
+ "__inputs": [
+ {
+ "name": "DS_GRAPHITE",
+ "label": "graphite",
+ "description": "",
+ "type": "datasource",
+ "pluginId": "graphite",
+ "pluginName": "Graphite"
+ }
+ ],
+ "__requires": [
+ {
+ "type": "panel",
+ "id": "graph",
+ "name": "Graph",
+ "version": ""
+ },
+ {
+ "type": "grafana",
+ "id": "grafana",
+ "name": "Grafana",
+ "version": "3.1.0"
+ },
+ {
+ "type": "datasource",
+ "id": "graphite",
+ "name": "Graphite",
+ "version": "1.0.0"
+ }
+ ],
+ "id": null,
+ "title": "Dashboard with many alerts",
+ "tags": [],
+ "style": "dark",
+ "timezone": "browser",
+ "editable": true,
+ "hideControls": false,
+ "sharedCrosshair": false,
+ "rows": [
+ {
+ "collapse": false,
+ "editable": true,
+ "height": "250px",
+ "panels": [
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 30
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "sum"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "60s",
+ "handler": 1,
+ "name": "Critical alert panel",
+ "notifications": [],
+ "severity": "critical"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "grid": {},
+ "id": 1,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "line": true,
+ "lineColor": "rgba(237, 46, 24, 0.60)",
+ "op": "gt",
+ "value": 30
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Critical panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 30
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "sum"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "60s",
+ "handler": 1,
+ "name": "Critical alert panel",
+ "notifications": [],
+ "severity": "critical"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "grid": {},
+ "id": 5,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "line": true,
+ "lineColor": "rgba(237, 46, 24, 0.60)",
+ "op": "gt",
+ "value": 30
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Critical panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 30
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "sum"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "60s",
+ "handler": 1,
+ "name": "Critical alert panel",
+ "notifications": [],
+ "severity": "critical"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "grid": {},
+ "id": 6,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "line": true,
+ "lineColor": "rgba(237, 46, 24, 0.60)",
+ "op": "gt",
+ "value": 30
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Critical panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 30
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "sum"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "60s",
+ "handler": 1,
+ "name": "Critical alert panel",
+ "notifications": [],
+ "severity": "critical"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "grid": {},
+ "id": 8,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "line": true,
+ "lineColor": "rgba(237, 46, 24, 0.60)",
+ "op": "gt",
+ "value": 30
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Critical panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ }
+ ],
+ "title": "Row"
+ },
+ {
+ "collapse": false,
+ "editable": true,
+ "height": "250px",
+ "panels": [
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 20
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "60s",
+ "handler": 1,
+ "name": "Warning panel alert",
+ "notifications": [],
+ "severity": "warning"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 2,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "warning",
+ "fill": true,
+ "fillColor": "rgba(235, 138, 14, 0.12)",
+ "line": true,
+ "lineColor": "rgba(247, 149, 32, 0.60)",
+ "op": "gt",
+ "value": 20
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Warning panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 20
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "60s",
+ "handler": 1,
+ "name": "Warning panel alert",
+ "notifications": [],
+ "severity": "warning"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 3,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "warning",
+ "fill": true,
+ "fillColor": "rgba(235, 138, 14, 0.12)",
+ "line": true,
+ "lineColor": "rgba(247, 149, 32, 0.60)",
+ "op": "gt",
+ "value": 20
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Warning panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 20
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "60s",
+ "handler": 1,
+ "name": "Warning panel alert",
+ "notifications": [],
+ "severity": "warning"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 4,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "warning",
+ "fill": true,
+ "fillColor": "rgba(235, 138, 14, 0.12)",
+ "line": true,
+ "lineColor": "rgba(247, 149, 32, 0.60)",
+ "op": "gt",
+ "value": 20
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Warning panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 20
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "60s",
+ "handler": 1,
+ "name": "Warning panel alert",
+ "notifications": [],
+ "severity": "warning"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 7,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "warning",
+ "fill": true,
+ "fillColor": "rgba(235, 138, 14, 0.12)",
+ "line": true,
+ "lineColor": "rgba(247, 149, 32, 0.60)",
+ "op": "gt",
+ "value": 20
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Warning panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ }
+ ],
+ "title": "New row"
+ },
+ {
+ "collapse": false,
+ "editable": true,
+ "height": "250px",
+ "panels": [
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 50
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "10s",
+ "handler": 1,
+ "name": "Fast Critical panel alert",
+ "notifications": [],
+ "severity": "critical"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 9,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "line": true,
+ "lineColor": "rgba(237, 46, 24, 0.60)",
+ "op": "gt",
+ "value": 50
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Fast Critical panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 50
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "10s",
+ "handler": 1,
+ "name": "Fast Critical panel alert",
+ "notifications": [],
+ "severity": "critical"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 10,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "line": true,
+ "lineColor": "rgba(237, 46, 24, 0.60)",
+ "op": "gt",
+ "value": 50
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Fast Critical panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 50
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "10s",
+ "handler": 1,
+ "name": "Fast Critical panel alert",
+ "notifications": [],
+ "severity": "critical"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 11,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "line": true,
+ "lineColor": "rgba(237, 46, 24, 0.60)",
+ "op": "gt",
+ "value": 50
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Fast Critical panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 50
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "10s",
+ "handler": 1,
+ "name": "Fast Critical panel alert",
+ "notifications": [],
+ "severity": "critical"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 12,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "line": true,
+ "lineColor": "rgba(237, 46, 24, 0.60)",
+ "op": "gt",
+ "value": 50
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Fast Critical panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ }
+ ],
+ "title": "New row"
+ },
+ {
+ "collapse": false,
+ "editable": true,
+ "height": "250px",
+ "panels": [
+ {
+ "alert": {
+ "enabled": true,
+ "conditions": [
+ {
+ "type": "query",
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "type": "avg",
+ "params": []
+ },
+ "evaluator": {
+ "type": "gt",
+ "params": [
+ 10
+ ]
+ }
+ }
+ ],
+ "severity": "warning",
+ "frequency": "1s",
+ "handler": 1,
+ "notifications": [],
+ "name": "Fast Warning panel alert"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 13,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "value": 10,
+ "op": "gt",
+ "fill": true,
+ "line": true,
+ "colorMode": "warning",
+ "fillColor": "rgba(235, 138, 14, 0.12)",
+ "lineColor": "rgba(247, 149, 32, 0.60)"
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Fast Warning panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "enabled": true,
+ "conditions": [
+ {
+ "type": "query",
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "type": "avg",
+ "params": []
+ },
+ "evaluator": {
+ "type": "gt",
+ "params": [
+ 10
+ ]
+ }
+ }
+ ],
+ "severity": "warning",
+ "frequency": "1s",
+ "handler": 1,
+ "notifications": [],
+ "name": "Fast Warning panel alert"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 14,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "value": 10,
+ "op": "gt",
+ "fill": true,
+ "line": true,
+ "colorMode": "warning",
+ "fillColor": "rgba(235, 138, 14, 0.12)",
+ "lineColor": "rgba(247, 149, 32, 0.60)"
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Fast Warning panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "enabled": true,
+ "conditions": [
+ {
+ "type": "query",
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "type": "avg",
+ "params": []
+ },
+ "evaluator": {
+ "type": "gt",
+ "params": [
+ 10
+ ]
+ }
+ }
+ ],
+ "severity": "warning",
+ "frequency": "1s",
+ "handler": 1,
+ "notifications": [],
+ "name": "Fast Warning panel alert"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 15,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "value": 10,
+ "op": "gt",
+ "fill": true,
+ "line": true,
+ "colorMode": "warning",
+ "fillColor": "rgba(235, 138, 14, 0.12)",
+ "lineColor": "rgba(247, 149, 32, 0.60)"
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Fast Warning panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "enabled": true,
+ "conditions": [
+ {
+ "type": "query",
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "type": "avg",
+ "params": []
+ },
+ "evaluator": {
+ "type": "gt",
+ "params": [
+ 10
+ ]
+ }
+ }
+ ],
+ "severity": "warning",
+ "frequency": "1s",
+ "handler": 1,
+ "notifications": [],
+ "name": "Fast Warning panel alert"
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "${DS_GRAPHITE}",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 16,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
+ }
+ ],
+ "thresholds": [
+ {
+ "value": 10,
+ "op": "gt",
+ "fill": true,
+ "line": true,
+ "colorMode": "warning",
+ "fillColor": "rgba(235, 138, 14, 0.12)",
+ "lineColor": "rgba(247, 149, 32, 0.60)"
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Fast Warning panel",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "show": true
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ }
+ ],
+ "title": "New row"
+ },
+ {
+ "title": "New row",
+ "height": "250px",
+ "editable": true,
+ "collapse": false,
+ "panels": [
+ {
+ "title": "Alert below value",
+ "error": false,
+ "span": 3,
+ "editable": true,
+ "type": "graph",
+ "isNew": true,
+ "id": 17,
+ "targets": [
+ {
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)",
+ "refId": "A"
+ }
+ ],
+ "datasource": "${DS_GRAPHITE}",
+ "renderer": "flot",
+ "yaxes": [
+ {
+ "label": null,
+ "show": true,
+ "logBase": 1,
+ "min": null,
+ "max": null,
+ "format": "short"
+ },
+ {
+ "label": null,
+ "show": true,
+ "logBase": 1,
+ "min": null,
+ "max": null,
+ "format": "short"
+ }
+ ],
+ "xaxis": {
+ "show": true
+ },
+ "alert": {
+ "conditions": [
+ {
+ "type": "query",
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "type": "avg",
+ "params": []
+ },
+ "evaluator": {
+ "type": "lt",
+ "params": [
+ 20
+ ]
+ }
+ }
+ ],
+ "severity": "critical",
+ "frequency": "60s",
+ "handler": 1,
+ "notifications": [],
+ "name": "Alert below value",
+ "enabled": true
+ },
+ "lines": true,
+ "fill": 1,
+ "linewidth": 2,
+ "points": false,
+ "pointradius": 5,
+ "bars": false,
+ "stack": false,
+ "percentage": false,
+ "legend": {
+ "show": true,
+ "values": false,
+ "min": false,
+ "max": false,
+ "current": false,
+ "total": false,
+ "avg": false
+ },
+ "nullPointMode": "connected",
+ "steppedLine": false,
+ "tooltip": {
+ "value_type": "cumulative",
+ "shared": true,
+ "sort": 0,
+ "msResolution": false
+ },
+ "timeFrom": null,
+ "timeShift": null,
+ "aliasColors": {},
+ "seriesOverrides": [],
+ "thresholds": [
+ {
+ "value": 20,
+ "op": "lt",
+ "fill": true,
+ "line": true,
+ "colorMode": "critical",
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "lineColor": "rgba(237, 46, 24, 0.60)"
+ }
+ ],
+ "links": []
+ },
+ {
+ "title": "Alert is outside range",
+ "error": false,
+ "span": 3,
+ "editable": true,
+ "type": "graph",
+ "isNew": true,
+ "id": 18,
+ "targets": [
+ {
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)",
+ "refId": "A"
+ }
+ ],
+ "datasource": "${DS_GRAPHITE}",
+ "renderer": "flot",
+ "yaxes": [
+ {
+ "label": null,
+ "show": true,
+ "logBase": 1,
+ "min": null,
+ "max": null,
+ "format": "short"
+ },
+ {
+ "label": null,
+ "show": true,
+ "logBase": 1,
+ "min": null,
+ "max": null,
+ "format": "short"
+ }
+ ],
+ "xaxis": {
+ "show": true
+ },
+ "alert": {
+ "conditions": [
+ {
+ "type": "query",
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "type": "avg",
+ "params": []
+ },
+ "evaluator": {
+ "type": "outside_range",
+ "params": [
+ 10,
+ 80
+ ]
+ }
+ }
+ ],
+ "severity": "critical",
+ "frequency": "10s",
+ "handler": 1,
+ "notifications": [],
+ "name": "Alert is outside range",
+ "enabled": true
+ },
+ "lines": true,
+ "fill": 1,
+ "linewidth": 2,
+ "points": false,
+ "pointradius": 5,
+ "bars": false,
+ "stack": false,
+ "percentage": false,
+ "legend": {
+ "show": true,
+ "values": false,
+ "min": false,
+ "max": false,
+ "current": false,
+ "total": false,
+ "avg": false
+ },
+ "nullPointMode": "connected",
+ "steppedLine": false,
+ "tooltip": {
+ "value_type": "cumulative",
+ "shared": true,
+ "sort": 0,
+ "msResolution": false
+ },
+ "timeFrom": null,
+ "timeShift": null,
+ "aliasColors": {},
+ "seriesOverrides": [],
+ "thresholds": [
+ {
+ "value": 10,
+ "op": "lt",
+ "fill": true,
+ "line": true,
+ "colorMode": "critical",
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "lineColor": "rgba(237, 46, 24, 0.60)"
+ },
+ {
+ "value": 80,
+ "op": "gt",
+ "fill": true,
+ "line": true,
+ "colorMode": "critical",
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "lineColor": "rgba(237, 46, 24, 0.60)"
+ }
+ ],
+ "links": []
+ },
+ {
+ "title": "Alert is within range",
+ "error": false,
+ "span": 3,
+ "editable": true,
+ "type": "graph",
+ "isNew": true,
+ "id": 19,
+ "targets": [
+ {
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)",
+ "refId": "A"
+ }
+ ],
+ "datasource": "${DS_GRAPHITE}",
+ "renderer": "flot",
+ "yaxes": [
+ {
+ "label": null,
+ "show": true,
+ "logBase": 1,
+ "min": null,
+ "max": null,
+ "format": "short"
+ },
+ {
+ "label": null,
+ "show": true,
+ "logBase": 1,
+ "min": null,
+ "max": null,
+ "format": "short"
+ }
+ ],
+ "xaxis": {
+ "show": true
+ },
+ "alert": {
+ "conditions": [
+ {
+ "type": "query",
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "type": "avg",
+ "params": []
+ },
+ "evaluator": {
+ "type": "within_range",
+ "params": [
+ 60,
+ 80
+ ]
+ }
+ }
+ ],
+ "severity": "critical",
+ "frequency": "10s",
+ "handler": 1,
+ "notifications": [],
+ "name": "Alert is within range",
+ "enabled": true
+ },
+ "lines": true,
+ "fill": 1,
+ "linewidth": 2,
+ "points": false,
+ "pointradius": 5,
+ "bars": false,
+ "stack": false,
+ "percentage": false,
+ "legend": {
+ "show": true,
+ "values": false,
+ "min": false,
+ "max": false,
+ "current": false,
+ "total": false,
+ "avg": false
+ },
+ "nullPointMode": "connected",
+ "steppedLine": false,
+ "tooltip": {
+ "value_type": "cumulative",
+ "shared": true,
+ "sort": 0,
+ "msResolution": false
+ },
+ "timeFrom": null,
+ "timeShift": null,
+ "aliasColors": {},
+ "seriesOverrides": [],
+ "thresholds": [
+ {
+ "value": 60,
+ "op": "gt",
+ "fill": true,
+ "line": true,
+ "colorMode": "critical",
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "lineColor": "rgba(237, 46, 24, 0.60)"
+ },
+ {
+ "value": 80,
+ "op": "lt",
+ "fill": true,
+ "line": true,
+ "colorMode": "critical",
+ "fillColor": "rgba(234, 112, 112, 0.12)",
+ "lineColor": "rgba(237, 46, 24, 0.60)"
+ }
+ ],
+ "links": []
+ }
+ ]
+ }
+ ],
+ "time": {
+ "from": "now-6h",
+ "to": "now"
+ },
+ "timepicker": {
+ "refresh_intervals": [
+ "5s",
+ "10s",
+ "30s",
+ "1m",
+ "5m",
+ "15m",
+ "30m",
+ "1h",
+ "2h",
+ "1d"
+ ],
+ "time_options": [
+ "5m",
+ "15m",
+ "1h",
+ "6h",
+ "12h",
+ "24h",
+ "2d",
+ "7d",
+ "30d"
+ ]
+ },
+ "templating": {
+ "list": []
+ },
+ "annotations": {
+ "list": []
+ },
+ "schemaVersion": 13,
+ "version": 50,
+ "links": [],
+ "gnetId": null
+}
\ No newline at end of file
diff --git a/examples/boilerplate-es5-panel/css/styles.css b/examples/boilerplate-es5-panel/css/styles.css
deleted file mode 100644
index b7259cb6cc8..00000000000
--- a/examples/boilerplate-es5-panel/css/styles.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.panel-boilerplate-values {
- text-align: center;
-}
\ No newline at end of file
diff --git a/examples/boilerplate-es5-panel/module.js b/examples/boilerplate-es5-panel/module.js
deleted file mode 100644
index ef6b23ea749..00000000000
--- a/examples/boilerplate-es5-panel/module.js
+++ /dev/null
@@ -1,53 +0,0 @@
-define([
- 'app/plugins/sdk',
- 'lodash',
- './css/styles.css!'
-], function(sdk, _) {
-
- var BoilerPlatePanelCtrl = (function(_super) {
- var self;
-
- function BoilerPlatePanelCtrl($scope, $injector) {
- _super.call(this, $scope, $injector);
-
- this.results = []
-
- self = this;
- }
-
- // you do not need a templateUrl, you can use a inline template here
- // BoilerPlatePanelCtrl.template = 'boilerplate ';
-
- // all panel static assets can be accessed via 'public/plugins//
- BoilerPlatePanelCtrl.templateUrl = 'panel.html';
-
- BoilerPlatePanelCtrl.prototype = Object.create(_super.prototype);
- BoilerPlatePanelCtrl.prototype.constructor = BoilerPlatePanelCtrl;
-
- BoilerPlatePanelCtrl.prototype.refreshData = function(datasource) {
- this.issueQueries(datasource)
- .then(function(result) {
- self.results = [];
- _.each(result.data, function(target) {
- var last = _.last(target.datapoints)
- self.results.push(last[0]);
- });
-
- self.render();
- });
- }
-
- BoilerPlatePanelCtrl.prototype.render = function() {
- this.values = this.results.join(',');
- }
-
- return BoilerPlatePanelCtrl;
-
- })(sdk.MetricsPanelCtrl);
-
-
- return {
- PanelCtrl: BoilerPlatePanelCtrl
- };
-});
-
diff --git a/examples/boilerplate-es5-panel/panel.html b/examples/boilerplate-es5-panel/panel.html
deleted file mode 100644
index 4a413c95dfe..00000000000
--- a/examples/boilerplate-es5-panel/panel.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- Basic panel
-
-
-{{ctrl.values}}
-
-
diff --git a/examples/boilerplate-es5-panel/plugin.json b/examples/boilerplate-es5-panel/plugin.json
deleted file mode 100644
index b585698c20a..00000000000
--- a/examples/boilerplate-es5-panel/plugin.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "type": "panel",
- "name": "Panel Boilerplate",
- "id": "panel-boilerplate-es5",
- "staticRoot": "."
-}
diff --git a/karma.conf.js b/karma.conf.js
index cbb0abff7c6..cdcea23a90b 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -9,7 +9,6 @@ module.exports = function(config) {
// list of files / patterns to load in the browser
files: [
'vendor/npm/es6-shim/es6-shim.js',
- 'vendor/npm/es6-promise/dist/es6-promise.js',
'vendor/npm/systemjs/dist/system.src.js',
'test/test-main.js',
@@ -25,9 +24,10 @@ module.exports = function(config) {
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['PhantomJS'],
- captureTimeout: 2000,
+ captureTimeout: 20000,
singleRun: true,
autoWatchBatchDelay: 1000,
+ browserNoActivityTimeout: 60000,
});
diff --git a/latest.json b/latest.json
index 79eb42a8527..78fd48769e8 100644
--- a/latest.json
+++ b/latest.json
@@ -1,3 +1,4 @@
{
- "version": "2.1.1"
+ "stable": "4.0.2",
+ "testing": "4.0.2"
}
diff --git a/package.json b/package.json
index ad4840144dc..5124edff40b 100644
--- a/package.json
+++ b/package.json
@@ -4,81 +4,83 @@
"company": "Coding Instinct AB"
},
"name": "grafana",
- "version": "3.0.0-beta1",
+ "version": "4.2.0-pre1",
"repository": {
"type": "git",
"url": "http://github.com/grafana/grafana.git"
},
"devDependencies": {
- "angular2": "2.0.0-beta.12",
- "zone.js": "^0.6.6",
- "autoprefixer": "^6.3.3",
+ "autoprefixer": "^6.4.0",
"es6-promise": "^3.0.2",
- "es6-shim": "^0.35.0",
+ "es6-shim": "^0.35.1",
"expect.js": "~0.2.0",
- "glob": "~3.2.7",
- "grunt": "~0.4.0",
- "grunt-angular-templates": "^0.5.5",
- "grunt-cli": "~0.1.13",
- "grunt-contrib-clean": "~0.7.0",
- "grunt-contrib-compress": "~0.14.0",
- "grunt-contrib-concat": "^0.5.1",
- "grunt-contrib-copy": "~0.8.2",
- "grunt-contrib-cssmin": "~0.14.0",
- "grunt-contrib-htmlmin": "~0.6.0",
- "grunt-contrib-jshint": "~1.0.0",
- "grunt-contrib-less": "~0.7.0",
- "grunt-contrib-uglify": "~0.11.0",
- "grunt-contrib-watch": "^0.6.1",
- "grunt-filerev": "^0.2.1",
- "grunt-git-describe": "~2.3.2",
- "grunt-karma": "~0.12.1",
- "grunt-ng-annotate": "^1.0.1",
- "grunt-notify": "^0.4.3",
+ "glob": "~7.0.0",
+ "grunt": "^0.4.5",
+ "grunt-angular-templates": "^1.1.0",
+ "grunt-cli": "~1.2.0",
+ "grunt-contrib-clean": "~1.0.0",
+ "grunt-contrib-compress": "^1.3.0",
+ "grunt-contrib-concat": "^1.0.1",
+ "grunt-contrib-copy": "~1.0.0",
+ "grunt-contrib-cssmin": "~1.0.2",
+ "grunt-contrib-htmlmin": "~2.0.0",
+ "grunt-contrib-jshint": "~1.1.0",
+ "grunt-contrib-uglify": "~2.0.0",
+ "grunt-contrib-watch": "^1.0.0",
+ "grunt-exec": "^1.0.1",
+ "grunt-filerev": "^2.3.1",
+ "grunt-git-describe": "~2.4.2",
+ "grunt-karma": "~2.0.0",
+ "grunt-ng-annotate": "^3.0.0",
+ "grunt-notify": "^0.4.5",
"grunt-postcss": "^0.8.0",
- "grunt-sass": "^1.1.0",
- "grunt-string-replace": "~1.2.1",
- "grunt-systemjs-builder": "^0.2.6",
- "grunt-tslint": "^3.0.2",
- "grunt-typescript": "^0.8.0",
- "grunt-usemin": "3.0.0",
- "jshint-stylish": "~2.1.0",
- "karma": "~0.13.15",
- "karma-chrome-launcher": "~0.2.2",
- "karma-coverage": "0.5.3",
+ "grunt-sass": "^1.2.1",
+ "grunt-string-replace": "~1.3.1",
+ "grunt-systemjs-builder": "^0.2.7",
+ "grunt-usemin": "3.1.1",
+ "jshint-stylish": "~2.2.1",
+ "karma": "1.3.0",
+ "karma-chrome-launcher": "~2.0.0",
+ "karma-coverage": "1.1.1",
"karma-coveralls": "1.1.2",
- "karma-expect": "~1.1.0",
- "karma-mocha": "~0.2.1",
- "karma-phantomjs-launcher": "1.0.0",
- "load-grunt-tasks": "3.4.0",
- "mocha": "2.3.4",
- "phantomjs-prebuilt": "^2.1.3",
- "reflect-metadata": "0.1.2",
- "rxjs": "5.0.0-beta.2",
- "sass-lint": "^1.5.0",
- "systemjs": "0.19.24"
+ "karma-expect": "~1.1.3",
+ "karma-mocha": "~1.3.0",
+ "karma-phantomjs-launcher": "1.0.2",
+ "load-grunt-tasks": "3.5.2",
+ "mocha": "3.2.0",
+ "phantomjs-prebuilt": "^2.1.14",
+ "reflect-metadata": "0.1.8",
+ "rxjs": "^5.0.0-rc.5",
+ "sass-lint": "^1.10.2",
+ "systemjs": "0.19.41",
+ "zone.js": "^0.7.2"
},
"engines": {
- "node": "0.4.x",
+ "node": "4.x",
"npm": "2.14.x"
},
"scripts": {
+ "build": "grunt",
"test": "grunt test",
"coveralls": "grunt karma:coveralls && rm -rf ./coverage"
},
"license": "Apache-2.0",
"dependencies": {
- "grunt-jscs": "~1.5.x",
- "grunt-sass-lint": "^0.1.0",
- "grunt-sync": "^0.4.1",
- "karma-sinon": "^1.0.3",
- "lodash": "^2.4.1",
- "remarkable": "^1.6.2",
- "sinon": "1.16.1",
- "systemjs-builder": "^0.15.13",
- "tether": "^1.2.0",
- "tether-drop": "^1.4.2",
- "tslint": "^3.4.0",
- "typescript": "^1.7.5"
+ "eventemitter3": "^2.0.2",
+ "gaze": "^1.1.2",
+ "grunt-jscs": "3.0.1",
+ "grunt-sass-lint": "^0.2.2",
+ "grunt-sync": "^0.6.2",
+ "karma-sinon": "^1.0.5",
+ "lodash": "^4.17.2",
+ "mousetrap": "^1.6.0",
+ "remarkable": "^1.7.1",
+ "sinon": "1.17.6",
+ "systemjs-builder": "^0.15.34",
+ "tether": "^1.4.0",
+ "tether-drop": "git://github.com/torkelo/drop",
+ "tslint": "^4.0.2",
+ "typescript": "^2.1.4",
+ "virtual-scroll": "^1.1.1"
}
}
diff --git a/packaging/deb/control/postinst b/packaging/deb/control/postinst
index b93c8433490..425a7319e62 100755
--- a/packaging/deb/control/postinst
+++ b/packaging/deb/control/postinst
@@ -7,12 +7,12 @@ set -e
startGrafana() {
if [ -x /bin/systemctl ]; then
/bin/systemctl daemon-reload
- /bin/systemctl start grafana-server
+ /bin/systemctl restart grafana-server
elif [ -x "/etc/init.d/grafana-server" ]; then
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d grafana-server start || true
+ invoke-rc.d grafana-server restart || true
else
- /etc/init.d/grafana-server start || true
+ /etc/init.d/grafana-server restart || true
fi
fi
}
diff --git a/packaging/deb/systemd/grafana-server.service b/packaging/deb/systemd/grafana-server.service
index e87635bb3de..ea7193c55a6 100644
--- a/packaging/deb/systemd/grafana-server.service
+++ b/packaging/deb/systemd/grafana-server.service
@@ -1,5 +1,5 @@
[Unit]
-Description=Starts and stops a single grafana instance on this system
+Description=Grafana instance
Documentation=http://docs.grafana.org
Wants=network-online.target
After=network-online.target
diff --git a/packaging/mac/bin/grafana b/packaging/mac/bin/grafana
new file mode 100755
index 00000000000..fb33079079e
--- /dev/null
+++ b/packaging/mac/bin/grafana
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+DAEMON=grafana-server
+EXECUTABLE=/usr/local/bin/grafana-server
+CONFIG=/usr/local/etc/grafana/grafana.ini
+HOMEPATH=/usr/local/share/grafana
+LOGPATH=/usr/local/var/log/grafana
+DATAPATH=/usr/local/var/lib/grafana
+PLUGINPATH=/usr/local/var/lib/grafana/plugins
+
+case "$1" in
+start)
+ $EXECUTABLE --config=$CONFIG --homepath=$HOMEPATH cfg:default.paths.logs=$LOGPATH cfg:default.paths.data=$DATAPATH cfg:default.paths.plugins=$PLUGINPATH 2> /dev/null &
+ [ $? -eq 0 ] && echo "$DAEMON started"
+;;
+stop)
+ killall $DAEMON
+ [ $? -eq 0 ] && echo "$DAEMON stopped"
+;;
+restart)
+ $0 stop
+ $0 start
+;;
+*)
+ echo "Usage: $0 (start|stop|restart)"
+;;
+esac
diff --git a/packaging/publish/publish.sh b/packaging/publish/publish.sh
deleted file mode 100755
index d918f9a89d8..00000000000
--- a/packaging/publish/publish.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env bash
-
-deb_ver=3.0.0-pre1459399258
-rpm_ver=3.0.0-pre1459399258
-
-#rpm_ver=3.0.0-1
-
-#wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb
-
-# package_cloud push grafana/stable/debian/jessie grafana_${deb_ver}_amd64.deb
-# package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb
-
-package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb
-package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb
-
-wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm
-
-package_cloud push grafana/testing/el/6 grafana-${rpm_ver}.x86_64.rpm
-package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm
-
-# package_cloud push grafana/stable/el/7 grafana-${version}-1.x86_64.rpm
-# package_cloud push grafana/stable/el/6 grafana-${version}-1.x86_64.rpm
diff --git a/packaging/publish/publish_both.sh b/packaging/publish/publish_both.sh
new file mode 100755
index 00000000000..57adcbd3481
--- /dev/null
+++ b/packaging/publish/publish_both.sh
@@ -0,0 +1,19 @@
+#! /usr/bin/env bash
+deb_ver=4.0.2-1481203731
+rpm_ver=4.0.2-1481203731
+
+wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb
+
+package_cloud push grafana/stable/debian/jessie grafana_${deb_ver}_amd64.deb
+package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb
+
+package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb
+package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb
+
+wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm
+
+package_cloud push grafana/testing/el/6 grafana-${rpm_ver}.x86_64.rpm
+package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm
+
+package_cloud push grafana/stable/el/7 grafana-${rpm_ver}.x86_64.rpm
+package_cloud push grafana/stable/el/6 grafana-${rpm_ver}.x86_64.rpm
diff --git a/packaging/publish/publish_testing.sh b/packaging/publish/publish_testing.sh
new file mode 100755
index 00000000000..1e39d65b7e5
--- /dev/null
+++ b/packaging/publish/publish_testing.sh
@@ -0,0 +1,14 @@
+#! /usr/bin/env bash
+deb_ver=4.1.0-1482230757beta1
+rpm_ver=4.1.0-1482230757beta1
+
+wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb
+
+package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb
+package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb
+
+wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm
+
+package_cloud push grafana/testing/el/6 grafana-${rpm_ver}.x86_64.rpm
+package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm
+
diff --git a/packaging/release_process.md b/packaging/release_process.md
new file mode 100644
index 00000000000..6037a9c499c
--- /dev/null
+++ b/packaging/release_process.md
@@ -0,0 +1,29 @@
+# New Grafana Release Processes
+
+## Building release packages
+
+1) Update package.json so that it has the right version.
+2) Create a git tag for the release: `git tag -a v3.0.4 -m "3.0.4 release"`
+3) Push branch & tag to github!
+2) Packages from master a built automatically by circle CI for this repo [grafana/grafana-packer](https://github.com/grafana/grafana-packer)
+
+### Non master branch
+
+When building from non master branch create a new branch in repo [grafana/grafana-packer](https://github.com/grafana/grafana-packer)
+and configure circle.yml to deploy that branch as well, https://github.com/grafana/grafana-packer/blob/master/circle.yml#L25,
+you also need to update https://github.com/grafana/grafana-packer/blob/v3.1.x/deploy.sh#L7.
+
+### Windows build
+
+Sign into ci.appveyor.com and the Grafana project's build history page. Builds for windows take a long time (around 20min)
+and fail quite often for random reasons so I usually continue with the release process without a windows build already built.
+
+1) Click on the green build that has the correct version and tag
+2) Click on `DEPLOYMENTS`
+3) Click on `NEW DEPLOYMENT`
+4) Select GrafanaBuildS3
+4) Select the build you want to deploy.
+
+The deployment should be quick (just uploads the release zip file to S3)
+
+
diff --git a/packaging/rpm/init.d/grafana-server b/packaging/rpm/init.d/grafana-server
index c60f4fb6080..cb9bb73de7d 100755
--- a/packaging/rpm/init.d/grafana-server
+++ b/packaging/rpm/init.d/grafana-server
@@ -72,8 +72,6 @@ function isRunning() {
case "$1" in
start)
- echo -n $"Starting $DESC: .... "
-
isRunning
if [ $? -eq 0 ]; then
echo "Already running."
@@ -90,7 +88,7 @@ case "$1" in
# Start Daemon
cd $GRAFANA_HOME
- su -s /bin/sh -c "nohup ${DAEMON} ${DAEMON_OPTS} >> /dev/null 3>&1 &" $GRAFANA_USER 2> /dev/null
+ action $"Starting $DESC: ..." su -s /bin/sh -c "nohup ${DAEMON} ${DAEMON_OPTS} >> /dev/null 3>&1 &" $GRAFANA_USER 2> /dev/null
return=$?
if [ $return -eq 0 ]
then
@@ -114,26 +112,25 @@ case "$1" in
done
fi
- echo "OK"
exit $return
;;
stop)
- echo -n "Stopping $DESC ..."
+ echo -n "Stopping $DESC: ..."
if [ -f "$PID_FILE" ]; then
killproc -p $PID_FILE -d 20 $NAME
if [ $? -eq 1 ]; then
- echo -n "$DESC is not running but pid file exists, cleaning up"
+ echo "$DESC is not running but pid file exists, cleaning up"
elif [ $? -eq 3 ]; then
PID="`cat $PID_FILE`"
- echo -n "Failed to stop $DESC (pid $PID)"
+ echo "Failed to stop $DESC (pid $PID)"
exit 1
fi
rm -f "$PID_FILE"
- echo "OK"
+ echo ""
exit 0
else
- echo -n "(not running)"
+ echo "(not running)"
fi
exit 0
;;
diff --git a/packaging/rpm/systemd/grafana-server.service b/packaging/rpm/systemd/grafana-server.service
index d79c5987576..ec0ef7e804e 100644
--- a/packaging/rpm/systemd/grafana-server.service
+++ b/packaging/rpm/systemd/grafana-server.service
@@ -1,5 +1,5 @@
[Unit]
-Description=Starts and stops a single grafana instance on this system
+Description=Grafana instance
Documentation=http://docs.grafana.org
Wants=network-online.target
After=network-online.target
diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go
new file mode 100644
index 00000000000..143c72106fe
--- /dev/null
+++ b/pkg/api/alerting.go
@@ -0,0 +1,316 @@
+package api
+
+import (
+ "fmt"
+
+ "github.com/grafana/grafana/pkg/api/dtos"
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/middleware"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/alerting"
+)
+
+func ValidateOrgAlert(c *middleware.Context) {
+ id := c.ParamsInt64(":alertId")
+ query := models.GetAlertByIdQuery{Id: id}
+
+ if err := bus.Dispatch(&query); err != nil {
+ c.JsonApiErr(404, "Alert not found", nil)
+ return
+ }
+
+ if c.OrgId != query.Result.OrgId {
+ c.JsonApiErr(403, "You are not allowed to edit/view alert", nil)
+ return
+ }
+}
+
+func GetAlertStatesForDashboard(c *middleware.Context) Response {
+ dashboardId := c.QueryInt64("dashboardId")
+
+ if dashboardId == 0 {
+ return ApiError(400, "Missing query parameter dashboardId", nil)
+ }
+
+ query := models.GetAlertStatesForDashboardQuery{
+ OrgId: c.OrgId,
+ DashboardId: c.QueryInt64("dashboardId"),
+ }
+
+ if err := bus.Dispatch(&query); err != nil {
+ return ApiError(500, "Failed to fetch alert states", err)
+ }
+
+ return Json(200, query.Result)
+}
+
+// GET /api/alerts
+func GetAlerts(c *middleware.Context) Response {
+ query := models.GetAlertsQuery{
+ OrgId: c.OrgId,
+ DashboardId: c.QueryInt64("dashboardId"),
+ PanelId: c.QueryInt64("panelId"),
+ Limit: c.QueryInt64("limit"),
+ }
+
+ states := c.QueryStrings("state")
+ if len(states) > 0 {
+ query.State = states
+ }
+
+ if err := bus.Dispatch(&query); err != nil {
+ return ApiError(500, "List alerts failed", err)
+ }
+
+ dashboardIds := make([]int64, 0)
+ alertDTOs := make([]*dtos.AlertRule, 0)
+ for _, alert := range query.Result {
+ dashboardIds = append(dashboardIds, alert.DashboardId)
+ alertDTOs = append(alertDTOs, &dtos.AlertRule{
+ Id: alert.Id,
+ DashboardId: alert.DashboardId,
+ PanelId: alert.PanelId,
+ Name: alert.Name,
+ Message: alert.Message,
+ State: alert.State,
+ NewStateDate: alert.NewStateDate,
+ ExecutionError: alert.ExecutionError,
+ })
+ }
+
+ dashboardsQuery := models.GetDashboardsQuery{
+ DashboardIds: dashboardIds,
+ }
+
+ if len(alertDTOs) > 0 {
+ if err := bus.Dispatch(&dashboardsQuery); err != nil {
+ return ApiError(500, "List alerts failed", err)
+ }
+ }
+
+ //TODO: should be possible to speed this up with lookup table
+ for _, alert := range alertDTOs {
+ for _, dash := range dashboardsQuery.Result {
+ if alert.DashboardId == dash.Id {
+ alert.DashbboardUri = "db/" + dash.Slug
+ }
+ }
+ }
+
+ return Json(200, alertDTOs)
+}
+
+// POST /api/alerts/test
+func AlertTest(c *middleware.Context, dto dtos.AlertTestCommand) Response {
+ if _, idErr := dto.Dashboard.Get("id").Int64(); idErr != nil {
+ return ApiError(400, "The dashboard needs to be saved at least once before you can test an alert rule", nil)
+ }
+
+ backendCmd := alerting.AlertTestCommand{
+ OrgId: c.OrgId,
+ Dashboard: dto.Dashboard,
+ PanelId: dto.PanelId,
+ }
+
+ if err := bus.Dispatch(&backendCmd); err != nil {
+ if validationErr, ok := err.(alerting.ValidationError); ok {
+ return ApiError(422, validationErr.Error(), nil)
+ }
+ return ApiError(500, "Failed to test rule", err)
+ }
+
+ res := backendCmd.Result
+
+ dtoRes := &dtos.AlertTestResult{
+ Firing: res.Firing,
+ ConditionEvals: res.ConditionEvals,
+ }
+
+ if res.Error != nil {
+ dtoRes.Error = res.Error.Error()
+ }
+
+ for _, log := range res.Logs {
+ dtoRes.Logs = append(dtoRes.Logs, &dtos.AlertTestResultLog{Message: log.Message, Data: log.Data})
+ }
+ for _, match := range res.EvalMatches {
+ dtoRes.EvalMatches = append(dtoRes.EvalMatches, &dtos.EvalMatch{Metric: match.Metric, Value: match.Value})
+ }
+
+ dtoRes.TimeMs = fmt.Sprintf("%1.3fms", res.GetDurationMs())
+
+ return Json(200, dtoRes)
+}
+
+// GET /api/alerts/:id
+func GetAlert(c *middleware.Context) Response {
+ id := c.ParamsInt64(":alertId")
+ query := models.GetAlertByIdQuery{Id: id}
+
+ if err := bus.Dispatch(&query); err != nil {
+ return ApiError(500, "List alerts failed", err)
+ }
+
+ return Json(200, &query.Result)
+}
+
+// DEL /api/alerts/:id
+func DelAlert(c *middleware.Context) Response {
+ alertId := c.ParamsInt64(":alertId")
+
+ if alertId == 0 {
+ return ApiError(401, "Failed to parse alertid", nil)
+ }
+
+ cmd := models.DeleteAlertCommand{AlertId: alertId}
+
+ if err := bus.Dispatch(&cmd); err != nil {
+ return ApiError(500, "Failed to delete alert", err)
+ }
+
+ var resp = map[string]interface{}{"alertId": alertId}
+ return Json(200, resp)
+}
+
+func GetAlertNotifiers(c *middleware.Context) Response {
+ return Json(200, alerting.GetNotifiers())
+}
+
+func GetAlertNotifications(c *middleware.Context) Response {
+ query := &models.GetAllAlertNotificationsQuery{OrgId: c.OrgId}
+
+ if err := bus.Dispatch(query); err != nil {
+ return ApiError(500, "Failed to get alert notifications", err)
+ }
+
+ result := make([]*dtos.AlertNotification, 0)
+
+ for _, notification := range query.Result {
+ result = append(result, &dtos.AlertNotification{
+ Id: notification.Id,
+ Name: notification.Name,
+ Type: notification.Type,
+ IsDefault: notification.IsDefault,
+ Created: notification.Created,
+ Updated: notification.Updated,
+ })
+ }
+
+ return Json(200, result)
+}
+
+func GetAlertNotificationById(c *middleware.Context) Response {
+ query := &models.GetAlertNotificationsQuery{
+ OrgId: c.OrgId,
+ Id: c.ParamsInt64("notificationId"),
+ }
+
+ if err := bus.Dispatch(query); err != nil {
+ return ApiError(500, "Failed to get alert notifications", err)
+ }
+
+ return Json(200, query.Result)
+}
+
+func CreateAlertNotification(c *middleware.Context, cmd models.CreateAlertNotificationCommand) Response {
+ cmd.OrgId = c.OrgId
+
+ if err := bus.Dispatch(&cmd); err != nil {
+ return ApiError(500, "Failed to create alert notification", err)
+ }
+
+ return Json(200, cmd.Result)
+}
+
+func UpdateAlertNotification(c *middleware.Context, cmd models.UpdateAlertNotificationCommand) Response {
+ cmd.OrgId = c.OrgId
+
+ if err := bus.Dispatch(&cmd); err != nil {
+ return ApiError(500, "Failed to update alert notification", err)
+ }
+
+ return Json(200, cmd.Result)
+}
+
+func DeleteAlertNotification(c *middleware.Context) Response {
+ cmd := models.DeleteAlertNotificationCommand{
+ OrgId: c.OrgId,
+ Id: c.ParamsInt64("notificationId"),
+ }
+
+ if err := bus.Dispatch(&cmd); err != nil {
+ return ApiError(500, "Failed to delete alert notification", err)
+ }
+
+ return ApiSuccess("Notification deleted")
+}
+
+//POST /api/alert-notifications/test
+func NotificationTest(c *middleware.Context, dto dtos.NotificationTestCommand) Response {
+ cmd := &alerting.NotificationTestCommand{
+ Name: dto.Name,
+ Type: dto.Type,
+ Settings: dto.Settings,
+ }
+
+ if err := bus.Dispatch(cmd); err != nil {
+ return ApiError(500, "Failed to send alert notifications", err)
+ }
+
+ return ApiSuccess("Test notification sent")
+}
+
+//POST /api/alerts/:alertId/pause
+func PauseAlert(c *middleware.Context, dto dtos.PauseAlertCommand) Response {
+ alertId := c.ParamsInt64("alertId")
+ cmd := models.PauseAlertCommand{
+ OrgId: c.OrgId,
+ AlertIds: []int64{alertId},
+ Paused: dto.Paused,
+ }
+
+ if err := bus.Dispatch(&cmd); err != nil {
+ return ApiError(500, "", err)
+ }
+
+ var response models.AlertStateType = models.AlertStatePending
+ pausedState := "un paused"
+ if cmd.Paused {
+ response = models.AlertStatePaused
+ pausedState = "paused"
+ }
+
+ result := map[string]interface{}{
+ "alertId": alertId,
+ "state": response,
+ "message": "alert " + pausedState,
+ }
+
+ return Json(200, result)
+}
+
+//POST /api/admin/pause-all-alerts
+func PauseAllAlerts(c *middleware.Context, dto dtos.PauseAllAlertsCommand) Response {
+ updateCmd := models.PauseAllAlertCommand{
+ Paused: dto.Paused,
+ }
+
+ if err := bus.Dispatch(&updateCmd); err != nil {
+ return ApiError(500, "Failed to pause alerts", err)
+ }
+
+ var response models.AlertStateType = models.AlertStatePending
+ pausedState := "un paused"
+ if updateCmd.Paused {
+ response = models.AlertStatePaused
+ pausedState = "paused"
+ }
+
+ result := map[string]interface{}{
+ "state": response,
+ "message": "alerts " + pausedState,
+ "alertsAffected": updateCmd.ResultCount,
+ }
+
+ return Json(200, result)
+}
diff --git a/pkg/api/annotations.go b/pkg/api/annotations.go
new file mode 100644
index 00000000000..48bf6c327ad
--- /dev/null
+++ b/pkg/api/annotations.go
@@ -0,0 +1,62 @@
+package api
+
+import (
+ "github.com/grafana/grafana/pkg/api/dtos"
+ "github.com/grafana/grafana/pkg/middleware"
+ "github.com/grafana/grafana/pkg/services/annotations"
+)
+
+func GetAnnotations(c *middleware.Context) Response {
+
+ query := &annotations.ItemQuery{
+ From: c.QueryInt64("from") / 1000,
+ To: c.QueryInt64("to") / 1000,
+ Type: annotations.ItemType(c.Query("type")),
+ OrgId: c.OrgId,
+ AlertId: c.QueryInt64("alertId"),
+ DashboardId: c.QueryInt64("dashboardId"),
+ PanelId: c.QueryInt64("panelId"),
+ Limit: c.QueryInt64("limit"),
+ NewState: c.QueryStrings("newState"),
+ }
+
+ repo := annotations.GetRepository()
+
+ items, err := repo.Find(query)
+ if err != nil {
+ return ApiError(500, "Failed to get annotations", err)
+ }
+
+ result := make([]dtos.Annotation, 0)
+
+ for _, item := range items {
+ result = append(result, dtos.Annotation{
+ AlertId: item.AlertId,
+ Time: item.Epoch * 1000,
+ Data: item.Data,
+ NewState: item.NewState,
+ PrevState: item.PrevState,
+ Text: item.Text,
+ Metric: item.Metric,
+ Title: item.Title,
+ })
+ }
+
+ return Json(200, result)
+}
+
+func DeleteAnnotations(c *middleware.Context, cmd dtos.DeleteAnnotationsCmd) Response {
+ repo := annotations.GetRepository()
+
+ err := repo.Delete(&annotations.DeleteParams{
+ AlertId: cmd.PanelId,
+ DashboardId: cmd.DashboardId,
+ PanelId: cmd.PanelId,
+ })
+
+ if err != nil {
+ return ApiError(500, "Failed to delete annotations", err)
+ }
+
+ return ApiSuccess("Annotations deleted")
+}
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 23a65c6a972..ef550838c56 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -19,6 +19,9 @@ func Register(r *macaron.Macaron) {
quota := middleware.Quota
bind := binding.Bind
+ // automatically set HEAD for every GET
+ r.SetAutoHead(true)
+
// not logged in views
r.Get("/", reqSignedIn, Index)
r.Get("/logout", Logout)
@@ -29,9 +32,12 @@ func Register(r *macaron.Macaron) {
// authed views
r.Get("/profile/", reqSignedIn, Index)
+ r.Get("/profile/password", reqSignedIn, Index)
+ r.Get("/profile/switch-org/:id", reqSignedIn, ChangeActiveOrgAndRedirectToHome)
r.Get("/org/", reqSignedIn, Index)
r.Get("/org/new", reqSignedIn, Index)
r.Get("/datasources/", reqSignedIn, Index)
+ r.Get("/datasources/new", reqSignedIn, Index)
r.Get("/datasources/edit/*", reqSignedIn, Index)
r.Get("/org/users/", reqSignedIn, Index)
r.Get("/org/apikeys/", reqSignedIn, Index)
@@ -52,10 +58,15 @@ func Register(r *macaron.Macaron) {
r.Get("/plugins/:id/page/:page", reqSignedIn, Index)
r.Get("/dashboard/*", reqSignedIn, Index)
+ r.Get("/dashboard-solo/snapshot/*", Index)
r.Get("/dashboard-solo/*", reqSignedIn, Index)
+ r.Get("/import/dashboard", reqSignedIn, Index)
+ r.Get("/dashboards/*", reqSignedIn, Index)
r.Get("/playlists/", reqSignedIn, Index)
r.Get("/playlists/*", reqSignedIn, Index)
+ r.Get("/alerting/", reqSignedIn, Index)
+ r.Get("/alerting/*", reqSignedIn, Index)
// sign up
r.Get("/signup", Index)
@@ -96,10 +107,18 @@ func Register(r *macaron.Macaron) {
r.Put("/", bind(m.UpdateUserCommand{}), wrap(UpdateSignedInUser))
r.Post("/using/:id", wrap(UserSetUsingOrg))
r.Get("/orgs", wrap(GetSignedInUserOrgList))
+
r.Post("/stars/dashboard/:id", wrap(StarDashboard))
r.Delete("/stars/dashboard/:id", wrap(UnstarDashboard))
+
r.Put("/password", bind(m.ChangeUserPasswordCommand{}), wrap(ChangeUserPassword))
r.Get("/quotas", wrap(GetUserQuotas))
+ r.Put("/helpflags/:id", wrap(SetHelpFlag))
+ // For dev purpose
+ r.Get("/helpflags/clear", wrap(ClearHelpFlags))
+
+ r.Get("/preferences", wrap(GetUserPreferences))
+ r.Put("/preferences", bind(dtos.UpdatePrefsCmd{}), wrap(UpdateUserPreferences))
})
// users (admin permission required)
@@ -108,6 +127,7 @@ func Register(r *macaron.Macaron) {
r.Get("/:id", wrap(GetUserById))
r.Get("/:id/orgs", wrap(GetUserOrgList))
r.Put("/:id", bind(m.UpdateUserCommand{}), wrap(UpdateUser))
+ r.Post("/:id/using/:orgId", wrap(UpdateUserActiveOrg))
}, reqGrafanaAdmin)
// org information available to all users.
@@ -130,6 +150,9 @@ func Register(r *macaron.Macaron) {
r.Post("/invites", quota("user"), bind(dtos.AddInviteForm{}), wrap(AddOrgInvite))
r.Patch("/invites/:code/revoke", wrap(RevokeInvite))
+ // prefs
+ r.Get("/preferences", wrap(GetOrgPreferences))
+ r.Put("/preferences", bind(dtos.UpdatePrefsCmd{}), wrap(UpdateOrgPreferences))
}, reqOrgAdmin)
// create new org
@@ -164,11 +187,16 @@ func Register(r *macaron.Macaron) {
r.Delete("/:id", wrap(DeleteApiKey))
}, reqOrgAdmin)
+ // Preferences
+ r.Group("/preferences", func() {
+ r.Post("/set-home-dash", bind(m.SavePreferencesCommand{}), wrap(SetHomeDashboard))
+ })
+
// Data sources
r.Group("/datasources", func() {
r.Get("/", GetDataSources)
r.Post("/", quota("data_source"), bind(m.AddDataSourceCommand{}), AddDataSource)
- r.Put("/:id", bind(m.UpdateDataSourceCommand{}), UpdateDataSource)
+ r.Put("/:id", bind(m.UpdateDataSourceCommand{}), wrap(UpdateDataSource))
r.Delete("/:id", DeleteDataSource)
r.Get("/:id", wrap(GetDataSourceById))
r.Get("/name/:name", wrap(GetDataSourceByName))
@@ -176,12 +204,12 @@ func Register(r *macaron.Macaron) {
r.Get("/datasources/id/:name", wrap(GetDataSourceIdByName), reqSignedIn)
- r.Group("/plugins", func() {
- r.Get("/", wrap(GetPluginList))
+ r.Get("/plugins", wrap(GetPluginList))
+ r.Get("/plugins/:pluginId/settings", wrap(GetPluginSettingById))
+ r.Get("/plugins/:pluginId/readme", wrap(GetPluginReadme))
- r.Get("/:pluginId/readme", wrap(GetPluginReadme))
+ r.Group("/plugins", func() {
r.Get("/:pluginId/dashboards/", wrap(GetPluginDashboards))
- r.Get("/:pluginId/settings", wrap(GetPluginSettingById))
r.Post("/:pluginId/settings", bind(m.UpdatePluginSettingCmd{}), wrap(UpdatePluginSetting))
}, reqOrgAdmin)
@@ -192,9 +220,9 @@ func Register(r *macaron.Macaron) {
// Dashboard
r.Group("/dashboards", func() {
r.Combo("/db/:slug").Get(GetDashboard).Delete(DeleteDashboard)
- r.Post("/db", reqEditorRole, bind(m.SaveDashboardCommand{}), PostDashboard)
+ r.Post("/db", reqEditorRole, bind(m.SaveDashboardCommand{}), wrap(PostDashboard))
r.Get("/file/:file", GetDashboardFromJsonFile)
- r.Get("/home", GetHomeDashboard)
+ r.Get("/home", wrap(GetHomeDashboard))
r.Get("/tags", GetDashboardTags)
r.Post("/import", bind(dtos.ImportDashboardCommand{}), wrap(ImportDashboard))
})
@@ -219,7 +247,36 @@ func Register(r *macaron.Macaron) {
r.Get("/search/", Search)
// metrics
- r.Get("/metrics/test", GetTestMetrics)
+ r.Post("/tsdb/query", bind(dtos.MetricRequest{}), wrap(QueryMetrics))
+ r.Get("/tsdb/testdata/scenarios", wrap(GetTestDataScenarios))
+
+ // metrics
+ r.Get("/metrics", wrap(GetInternalMetrics))
+
+ r.Group("/alerts", func() {
+ r.Post("/test", bind(dtos.AlertTestCommand{}), wrap(AlertTest))
+ r.Post("/:alertId/pause", bind(dtos.PauseAlertCommand{}), wrap(PauseAlert), reqEditorRole)
+ r.Get("/:alertId", ValidateOrgAlert, wrap(GetAlert))
+ r.Get("/", wrap(GetAlerts))
+ r.Get("/states-for-dashboard", wrap(GetAlertStatesForDashboard))
+ })
+
+ r.Get("/alert-notifications", wrap(GetAlertNotifications))
+ r.Get("/alert-notifiers", wrap(GetAlertNotifiers))
+
+ r.Group("/alert-notifications", func() {
+ r.Post("/test", bind(dtos.NotificationTestCommand{}), wrap(NotificationTest))
+ r.Post("/", bind(m.CreateAlertNotificationCommand{}), wrap(CreateAlertNotification))
+ r.Put("/:notificationId", bind(m.UpdateAlertNotificationCommand{}), wrap(UpdateAlertNotification))
+ r.Get("/:notificationId", wrap(GetAlertNotificationById))
+ r.Delete("/:notificationId", wrap(DeleteAlertNotification))
+ }, reqEditorRole)
+
+ r.Get("/annotations", wrap(GetAnnotations))
+ r.Post("/annotations/mass-delete", reqOrgAdmin, bind(dtos.DeleteAnnotationsCmd{}), wrap(DeleteAnnotations))
+
+ // error test
+ r.Get("/metrics/error", wrap(GenerateError))
}, reqSignedIn)
@@ -233,11 +290,15 @@ func Register(r *macaron.Macaron) {
r.Get("/users/:id/quotas", wrap(GetUserQuotas))
r.Put("/users/:id/quotas/:target", bind(m.UpdateUserQuotaCmd{}), wrap(UpdateUserQuota))
r.Get("/stats", AdminGetStats)
+ r.Post("/pause-all-alerts", bind(dtos.PauseAllAlertsCommand{}), wrap(PauseAllAlerts))
}, reqGrafanaAdmin)
// rendering
r.Get("/render/*", reqSignedIn, RenderToPng)
+ // grafana.net proxy
+ r.Any("/api/gnet/*", reqSignedIn, ProxyGnetRequest)
+
// Gravatar service.
avt := avatar.CacheServer()
r.Get("/avatar/:hash", avt.ServeHTTP)
@@ -251,4 +312,5 @@ func Register(r *macaron.Macaron) {
InitAppPluginRoutes(r)
+ r.NotFound(NotFoundHandler)
}
diff --git a/pkg/api/app_routes.go b/pkg/api/app_routes.go
index 5796f09bb21..aee67ac8478 100644
--- a/pkg/api/app_routes.go
+++ b/pkg/api/app_routes.go
@@ -1,6 +1,11 @@
package api
import (
+ "crypto/tls"
+ "net"
+ "net/http"
+ "time"
+
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/api/pluginproxy"
@@ -11,6 +16,16 @@ import (
"github.com/grafana/grafana/pkg/util"
)
+var pluginProxyTransport = &http.Transport{
+ TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+ Proxy: http.ProxyFromEnvironment,
+ Dial: (&net.Dialer{
+ Timeout: 30 * time.Second,
+ KeepAlive: 30 * time.Second,
+ }).Dial,
+ TLSHandshakeTimeout: 10 * time.Second,
+}
+
func InitAppPluginRoutes(r *macaron.Macaron) {
for _, plugin := range plugins.Apps {
for _, route := range plugin.Routes {
@@ -30,7 +45,7 @@ func InitAppPluginRoutes(r *macaron.Macaron) {
}
handlers = append(handlers, AppPluginRoute(route, plugin.Id))
r.Route(url, route.Method, handlers...)
- log.Info("Plugins: Adding proxy route %s", url)
+ log.Debug("Plugins: Adding proxy route %s", url)
}
}
}
@@ -40,7 +55,7 @@ func AppPluginRoute(route *plugins.AppPluginRoute, appId string) macaron.Handler
path := c.Params("*")
proxy := pluginproxy.NewApiPluginProxy(c, path, route, appId)
- proxy.Transport = dataProxyTransport
+ proxy.Transport = pluginProxyTransport
proxy.ServeHTTP(c.Resp, c.Req.Request)
}
}
diff --git a/pkg/api/avatar/avatar.go b/pkg/api/avatar/avatar.go
index 79aebece349..41ce857db4f 100644
--- a/pkg/api/avatar/avatar.go
+++ b/pkg/api/avatar/avatar.go
@@ -116,6 +116,7 @@ func (this *service) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if avatar.Expired() {
if err := avatar.Update(); err != nil {
log.Trace("avatar update error: %v", err)
+ avatar = this.notFound
}
}
diff --git a/pkg/api/cloudwatch/cloudwatch.go b/pkg/api/cloudwatch/cloudwatch.go
index 88d22800d65..1b796be874e 100644
--- a/pkg/api/cloudwatch/cloudwatch.go
+++ b/pkg/api/cloudwatch/cloudwatch.go
@@ -4,6 +4,8 @@ import (
"encoding/json"
"errors"
"io/ioutil"
+ "strings"
+ "sync"
"time"
"github.com/aws/aws-sdk-go/aws"
@@ -14,6 +16,8 @@ import (
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/cloudwatch"
"github.com/aws/aws-sdk-go/service/ec2"
+ "github.com/aws/aws-sdk-go/service/sts"
+ "github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
)
@@ -29,6 +33,39 @@ type cwRequest struct {
DataSource *m.DataSource
}
+type datasourceInfo struct {
+ Profile string
+ Region string
+ AssumeRoleArn string
+ Namespace string
+
+ AccessKey string
+ SecretKey string
+}
+
+func (req *cwRequest) GetDatasourceInfo() *datasourceInfo {
+ assumeRoleArn := req.DataSource.JsonData.Get("assumeRoleArn").MustString()
+ accessKey := ""
+ secretKey := ""
+
+ for key, value := range req.DataSource.SecureJsonData.Decrypt() {
+ if key == "accessKey" {
+ accessKey = value
+ }
+ if key == "secretKey" {
+ secretKey = value
+ }
+ }
+
+ return &datasourceInfo{
+ AssumeRoleArn: assumeRoleArn,
+ Region: req.Region,
+ Profile: req.DataSource.Database,
+ AccessKey: accessKey,
+ SecretKey: secretKey,
+ }
+}
+
func init() {
actionHandlers = map[string]actionHandler{
"GetMetricStatistics": handleGetMetricStatistics,
@@ -44,42 +81,122 @@ func init() {
}
}
-var awsCredentials map[string]*credentials.Credentials = make(map[string]*credentials.Credentials)
+type cache struct {
+ credential *credentials.Credentials
+ expiration *time.Time
+}
-func getCredentials(profile string) *credentials.Credentials {
- if _, ok := awsCredentials[profile]; ok {
- return awsCredentials[profile]
+var awsCredentialCache map[string]cache = make(map[string]cache)
+var credentialCacheLock sync.RWMutex
+
+func getCredentials(dsInfo *datasourceInfo) (*credentials.Credentials, error) {
+ cacheKey := dsInfo.Profile + ":" + dsInfo.AssumeRoleArn
+ credentialCacheLock.RLock()
+ if _, ok := awsCredentialCache[cacheKey]; ok {
+ if awsCredentialCache[cacheKey].expiration != nil &&
+ (*awsCredentialCache[cacheKey].expiration).After(time.Now().UTC()) {
+ result := awsCredentialCache[cacheKey].credential
+ credentialCacheLock.RUnlock()
+ return result, nil
+ }
+ }
+ credentialCacheLock.RUnlock()
+
+ accessKeyId := ""
+ secretAccessKey := ""
+ sessionToken := ""
+ var expiration *time.Time
+ expiration = nil
+ if strings.Index(dsInfo.AssumeRoleArn, "arn:aws:iam:") == 0 {
+ params := &sts.AssumeRoleInput{
+ RoleArn: aws.String(dsInfo.AssumeRoleArn),
+ RoleSessionName: aws.String("GrafanaSession"),
+ DurationSeconds: aws.Int64(900),
+ }
+
+ stsSess := session.New()
+ stsCreds := credentials.NewChainCredentials(
+ []credentials.Provider{
+ &credentials.EnvProvider{},
+ &credentials.SharedCredentialsProvider{Filename: "", Profile: dsInfo.Profile},
+ &ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(stsSess), ExpiryWindow: 5 * time.Minute},
+ })
+ stsConfig := &aws.Config{
+ Region: aws.String(dsInfo.Region),
+ Credentials: stsCreds,
+ }
+
+ svc := sts.New(session.New(stsConfig), stsConfig)
+ resp, err := svc.AssumeRole(params)
+ if err != nil {
+ return nil, err
+ }
+ if resp.Credentials != nil {
+ accessKeyId = *resp.Credentials.AccessKeyId
+ secretAccessKey = *resp.Credentials.SecretAccessKey
+ sessionToken = *resp.Credentials.SessionToken
+ expiration = resp.Credentials.Expiration
+ }
}
sess := session.New()
creds := credentials.NewChainCredentials(
[]credentials.Provider{
+ &credentials.StaticProvider{Value: credentials.Value{
+ AccessKeyID: accessKeyId,
+ SecretAccessKey: secretAccessKey,
+ SessionToken: sessionToken,
+ }},
&credentials.EnvProvider{},
- &credentials.SharedCredentialsProvider{Filename: "", Profile: profile},
+ &credentials.StaticProvider{Value: credentials.Value{
+ AccessKeyID: dsInfo.AccessKey,
+ SecretAccessKey: dsInfo.SecretKey,
+ }},
+ &credentials.SharedCredentialsProvider{Filename: "", Profile: dsInfo.Profile},
&ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(sess), ExpiryWindow: 5 * time.Minute},
})
- awsCredentials[profile] = creds
- return creds
+ credentialCacheLock.Lock()
+ awsCredentialCache[cacheKey] = cache{
+ credential: creds,
+ expiration: expiration,
+ }
+ credentialCacheLock.Unlock()
+
+ return creds, nil
+}
+
+func getAwsConfig(req *cwRequest) (*aws.Config, error) {
+ creds, err := getCredentials(req.GetDatasourceInfo())
+ if err != nil {
+ return nil, err
+ }
+
+ cfg := &aws.Config{
+ Region: aws.String(req.Region),
+ Credentials: creds,
+ }
+ return cfg, nil
}
func handleGetMetricStatistics(req *cwRequest, c *middleware.Context) {
- cfg := &aws.Config{
- Region: aws.String(req.Region),
- Credentials: getCredentials(req.DataSource.Database),
+ cfg, err := getAwsConfig(req)
+ if err != nil {
+ c.JsonApiErr(500, "Unable to call AWS API", err)
+ return
}
-
svc := cloudwatch.New(session.New(cfg), cfg)
reqParam := &struct {
Parameters struct {
- Namespace string `json:"namespace"`
- MetricName string `json:"metricName"`
- Dimensions []*cloudwatch.Dimension `json:"dimensions"`
- Statistics []*string `json:"statistics"`
- StartTime int64 `json:"startTime"`
- EndTime int64 `json:"endTime"`
- Period int64 `json:"period"`
+ Namespace string `json:"namespace"`
+ MetricName string `json:"metricName"`
+ Dimensions []*cloudwatch.Dimension `json:"dimensions"`
+ Statistics []*string `json:"statistics"`
+ ExtendedStatistics []*string `json:"extendedStatistics"`
+ StartTime int64 `json:"startTime"`
+ EndTime int64 `json:"endTime"`
+ Period int64 `json:"period"`
} `json:"parameters"`
}{}
json.Unmarshal(req.Body, reqParam)
@@ -88,27 +205,33 @@ func handleGetMetricStatistics(req *cwRequest, c *middleware.Context) {
Namespace: aws.String(reqParam.Parameters.Namespace),
MetricName: aws.String(reqParam.Parameters.MetricName),
Dimensions: reqParam.Parameters.Dimensions,
- Statistics: reqParam.Parameters.Statistics,
StartTime: aws.Time(time.Unix(reqParam.Parameters.StartTime, 0)),
EndTime: aws.Time(time.Unix(reqParam.Parameters.EndTime, 0)),
Period: aws.Int64(reqParam.Parameters.Period),
}
+ if len(reqParam.Parameters.Statistics) != 0 {
+ params.Statistics = reqParam.Parameters.Statistics
+ }
+ if len(reqParam.Parameters.ExtendedStatistics) != 0 {
+ params.ExtendedStatistics = reqParam.Parameters.ExtendedStatistics
+ }
resp, err := svc.GetMetricStatistics(params)
if err != nil {
c.JsonApiErr(500, "Unable to call AWS API", err)
return
}
+ metrics.M_Aws_CloudWatch_GetMetricStatistics.Inc(1)
c.JSON(200, resp)
}
func handleListMetrics(req *cwRequest, c *middleware.Context) {
- cfg := &aws.Config{
- Region: aws.String(req.Region),
- Credentials: getCredentials(req.DataSource.Database),
+ cfg, err := getAwsConfig(req)
+ if err != nil {
+ c.JsonApiErr(500, "Unable to call AWS API", err)
+ return
}
-
svc := cloudwatch.New(session.New(cfg), cfg)
reqParam := &struct {
@@ -127,8 +250,9 @@ func handleListMetrics(req *cwRequest, c *middleware.Context) {
}
var resp cloudwatch.ListMetricsOutput
- err := svc.ListMetricsPages(params,
+ err = svc.ListMetricsPages(params,
func(page *cloudwatch.ListMetricsOutput, lastPage bool) bool {
+ metrics.M_Aws_CloudWatch_ListMetrics.Inc(1)
metrics, _ := awsutil.ValuesAtPath(page, "Metrics")
for _, metric := range metrics {
resp.Metrics = append(resp.Metrics, metric.(*cloudwatch.Metric))
@@ -144,11 +268,11 @@ func handleListMetrics(req *cwRequest, c *middleware.Context) {
}
func handleDescribeAlarms(req *cwRequest, c *middleware.Context) {
- cfg := &aws.Config{
- Region: aws.String(req.Region),
- Credentials: getCredentials(req.DataSource.Database),
+ cfg, err := getAwsConfig(req)
+ if err != nil {
+ c.JsonApiErr(500, "Unable to call AWS API", err)
+ return
}
-
svc := cloudwatch.New(session.New(cfg), cfg)
reqParam := &struct {
@@ -187,20 +311,21 @@ func handleDescribeAlarms(req *cwRequest, c *middleware.Context) {
}
func handleDescribeAlarmsForMetric(req *cwRequest, c *middleware.Context) {
- cfg := &aws.Config{
- Region: aws.String(req.Region),
- Credentials: getCredentials(req.DataSource.Database),
+ cfg, err := getAwsConfig(req)
+ if err != nil {
+ c.JsonApiErr(500, "Unable to call AWS API", err)
+ return
}
-
svc := cloudwatch.New(session.New(cfg), cfg)
reqParam := &struct {
Parameters struct {
- Namespace string `json:"namespace"`
- MetricName string `json:"metricName"`
- Dimensions []*cloudwatch.Dimension `json:"dimensions"`
- Statistic string `json:"statistic"`
- Period int64 `json:"period"`
+ Namespace string `json:"namespace"`
+ MetricName string `json:"metricName"`
+ Dimensions []*cloudwatch.Dimension `json:"dimensions"`
+ Statistic string `json:"statistic"`
+ ExtendedStatistic string `json:"extendedStatistic"`
+ Period int64 `json:"period"`
} `json:"parameters"`
}{}
json.Unmarshal(req.Body, reqParam)
@@ -216,6 +341,9 @@ func handleDescribeAlarmsForMetric(req *cwRequest, c *middleware.Context) {
if reqParam.Parameters.Statistic != "" {
params.Statistic = aws.String(reqParam.Parameters.Statistic)
}
+ if reqParam.Parameters.ExtendedStatistic != "" {
+ params.ExtendedStatistic = aws.String(reqParam.Parameters.ExtendedStatistic)
+ }
resp, err := svc.DescribeAlarmsForMetric(params)
if err != nil {
@@ -227,11 +355,11 @@ func handleDescribeAlarmsForMetric(req *cwRequest, c *middleware.Context) {
}
func handleDescribeAlarmHistory(req *cwRequest, c *middleware.Context) {
- cfg := &aws.Config{
- Region: aws.String(req.Region),
- Credentials: getCredentials(req.DataSource.Database),
+ cfg, err := getAwsConfig(req)
+ if err != nil {
+ c.JsonApiErr(500, "Unable to call AWS API", err)
+ return
}
-
svc := cloudwatch.New(session.New(cfg), cfg)
reqParam := &struct {
@@ -263,11 +391,11 @@ func handleDescribeAlarmHistory(req *cwRequest, c *middleware.Context) {
}
func handleDescribeInstances(req *cwRequest, c *middleware.Context) {
- cfg := &aws.Config{
- Region: aws.String(req.Region),
- Credentials: getCredentials(req.DataSource.Database),
+ cfg, err := getAwsConfig(req)
+ if err != nil {
+ c.JsonApiErr(500, "Unable to call AWS API", err)
+ return
}
-
svc := ec2.New(session.New(cfg), cfg)
reqParam := &struct {
@@ -287,7 +415,7 @@ func handleDescribeInstances(req *cwRequest, c *middleware.Context) {
}
var resp ec2.DescribeInstancesOutput
- err := svc.DescribeInstancesPages(params,
+ err = svc.DescribeInstancesPages(params,
func(page *ec2.DescribeInstancesOutput, lastPage bool) bool {
reservations, _ := awsutil.ValuesAtPath(page, "Reservations")
for _, reservation := range reservations {
diff --git a/pkg/api/cloudwatch/metrics.go b/pkg/api/cloudwatch/metrics.go
index f5e5274a202..26c5c2cc3ec 100644
--- a/pkg/api/cloudwatch/metrics.go
+++ b/pkg/api/cloudwatch/metrics.go
@@ -11,6 +11,7 @@ import (
"github.com/aws/aws-sdk-go/aws/awsutil"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/cloudwatch"
+ "github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/util"
)
@@ -28,12 +29,19 @@ var customMetricsDimensionsMap map[string]map[string]map[string]*CustomMetricsCa
func init() {
metricsMap = map[string][]string{
- "AWS/AutoScaling": {"GroupMinSize", "GroupMaxSize", "GroupDesiredCapacity", "GroupInServiceInstances", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"},
- "AWS/Billing": {"EstimatedCharges"},
- "AWS/CloudFront": {"Requests", "BytesDownloaded", "BytesUploaded", "TotalErrorRate", "4xxErrorRate", "5xxErrorRate"},
- "AWS/CloudSearch": {"SuccessfulRequests", "SearchableDocuments", "IndexUtilization", "Partitions"},
- "AWS/DynamoDB": {"ConditionalCheckFailedRequests", "ConsumedReadCapacityUnits", "ConsumedWriteCapacityUnits", "OnlineIndexConsumedWriteCapacity", "OnlineIndexPercentageProgress", "OnlineIndexThrottleEvents", "ProvisionedReadCapacityUnits", "ProvisionedWriteCapacityUnits", "ReadThrottleEvents", "ReturnedItemCount", "SuccessfulRequestLatency", "SystemErrors", "ThrottledRequests", "UserErrors", "WriteThrottleEvents"},
- "AWS/ECS": {"CPUUtilization", "MemoryUtilization"},
+ "AWS/ApiGateway": {"4XXError", "5XXError", "CacheHitCount", "CacheMissCount", "Count", "IntegrationLatency", "Latency"},
+ "AWS/ApplicationELB": {"ActiveConnectionCount", "ClientTLSNegotiationErrorCount", "HealthyHostCount", "HTTPCode_ELB_4XX_Count", "HTTPCode_ELB_5XX_Count", "HTTPCode_Target_2XX_Count", "HTTPCode_Target_3XX_Count", "HTTPCode_Target_4XX_Count", "HTTPCode_Target_5XX_Count", "NewConnectionCount", "ProcessedBytes", "RejectedConnectionCount", "RequestCount", "TargetConnectionErrorCount", "TargetResponseTime", "TargetTLSNegotiationErrorCount", "UnHealthyHostCount"},
+ "AWS/AutoScaling": {"GroupMinSize", "GroupMaxSize", "GroupDesiredCapacity", "GroupInServiceInstances", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"},
+ "AWS/Billing": {"EstimatedCharges"},
+ "AWS/CloudFront": {"Requests", "BytesDownloaded", "BytesUploaded", "TotalErrorRate", "4xxErrorRate", "5xxErrorRate"},
+ "AWS/CloudSearch": {"SuccessfulRequests", "SearchableDocuments", "IndexUtilization", "Partitions"},
+ "AWS/DynamoDB": {"ConditionalCheckFailedRequests", "ConsumedReadCapacityUnits", "ConsumedWriteCapacityUnits", "OnlineIndexConsumedWriteCapacity", "OnlineIndexPercentageProgress", "OnlineIndexThrottleEvents", "ProvisionedReadCapacityUnits", "ProvisionedWriteCapacityUnits", "ReadThrottleEvents", "ReturnedBytes", "ReturnedItemCount", "ReturnedRecordsCount", "SuccessfulRequestLatency", "SystemErrors", "ThrottledRequests", "UserErrors", "WriteThrottleEvents"},
+ "AWS/EBS": {"VolumeReadBytes", "VolumeWriteBytes", "VolumeReadOps", "VolumeWriteOps", "VolumeTotalReadTime", "VolumeTotalWriteTime", "VolumeIdleTime", "VolumeQueueLength", "VolumeThroughputPercentage", "VolumeConsumedReadWriteOps", "BurstBalance"},
+ "AWS/EC2": {"CPUCreditUsage", "CPUCreditBalance", "CPUUtilization", "DiskReadOps", "DiskWriteOps", "DiskReadBytes", "DiskWriteBytes", "NetworkIn", "NetworkOut", "NetworkPacketsIn", "NetworkPacketsOut", "StatusCheckFailed", "StatusCheckFailed_Instance", "StatusCheckFailed_System"},
+ "AWS/EC2Spot": {"AvailableInstancePoolsCount", "BidsSubmittedForCapacity", "EligibleInstancePoolCount", "FulfilledCapacity", "MaxPercentCapacityAllocation", "PendingCapacity", "PercentCapacityAllocation", "TargetCapacity", "TerminatingCapacity"},
+ "AWS/ECS": {"CPUReservation", "MemoryReservation", "CPUUtilization", "MemoryUtilization"},
+ "AWS/EFS": {"BurstCreditBalance", "ClientConnections", "DataReadIOBytes", "DataWriteIOBytes", "MetadataIOBytes", "TotalIOBytes", "PermittedThroughput", "PercentIOLimit"},
+ "AWS/ELB": {"HealthyHostCount", "UnHealthyHostCount", "RequestCount", "Latency", "HTTPCode_ELB_4XX", "HTTPCode_ELB_5XX", "HTTPCode_Backend_2XX", "HTTPCode_Backend_3XX", "HTTPCode_Backend_4XX", "HTTPCode_Backend_5XX", "BackendConnectionErrors", "SurgeQueueLength", "SpilloverCount"},
"AWS/ElastiCache": {
"CPUUtilization", "FreeableMemory", "NetworkBytesIn", "NetworkBytesOut", "SwapUsage",
"BytesUsedForCacheItems", "BytesReadIntoMemcached", "BytesWrittenOutFromMemcached", "CasBadval", "CasHits", "CasMisses", "CmdFlush", "CmdGet", "CmdSet", "CurrConnections", "CurrItems", "DecrHits", "DecrMisses", "DeleteHits", "DeleteMisses", "Evictions", "GetHits", "GetMisses", "IncrHits", "IncrMisses", "Reclaimed",
@@ -42,9 +50,15 @@ func init() {
"BytesUsedForCache", "CacheHits", "CacheMisses", "CurrConnections", "Evictions", "HyperLogLogBasedCmds", "NewConnections", "Reclaimed", "ReplicationBytes", "ReplicationLag", "SaveInProgress",
"CurrItems", "GetTypeCmds", "HashBasedCmds", "KeyBasedCmds", "ListBasedCmds", "SetBasedCmds", "SetTypeCmds", "SortedSetBasedCmds", "StringBasedCmds",
},
- "AWS/EBS": {"VolumeReadBytes", "VolumeWriteBytes", "VolumeReadOps", "VolumeWriteOps", "VolumeTotalReadTime", "VolumeTotalWriteTime", "VolumeIdleTime", "VolumeQueueLength", "VolumeThroughputPercentage", "VolumeConsumedReadWriteOps"},
- "AWS/EC2": {"CPUCreditUsage", "CPUCreditBalance", "CPUUtilization", "DiskReadOps", "DiskWriteOps", "DiskReadBytes", "DiskWriteBytes", "NetworkIn", "NetworkOut", "StatusCheckFailed", "StatusCheckFailed_Instance", "StatusCheckFailed_System"},
- "AWS/ELB": {"HealthyHostCount", "UnHealthyHostCount", "RequestCount", "Latency", "HTTPCode_ELB_4XX", "HTTPCode_ELB_5XX", "HTTPCode_Backend_2XX", "HTTPCode_Backend_3XX", "HTTPCode_Backend_4XX", "HTTPCode_Backend_5XX", "BackendConnectionErrors", "SurgeQueueLength", "SpilloverCount"},
+ "AWS/ElasticBeanstalk": {
+ "EnvironmentHealth",
+ "ApplicationLatencyP10", "ApplicationLatencyP50", "ApplicationLatencyP75", "ApplicationLatencyP85", "ApplicationLatencyP90", "ApplicationLatencyP95", "ApplicationLatencyP99", "ApplicationLatencyP99.9",
+ "ApplicationRequests2xx", "ApplicationRequests3xx", "ApplicationRequests4xx", "ApplicationRequests5xx", "ApplicationRequestsTotal",
+ "CPUIdle", "CPUIowait", "CPUIrq", "CPUNice", "CPUSoftirq", "CPUSystem", "CPUUser",
+ "InstanceHealth", "InstancesDegraded", "InstancesInfo", "InstancesNoData", "InstancesOk", "InstancesPending", "InstancesSevere", "InstancesUnknown", "InstancesWarning",
+ "LoadAverage1min", "LoadAverage5min",
+ "RootFilesystemUtil",
+ },
"AWS/ElasticMapReduce": {"IsIdle", "JobsRunning", "JobsFailed",
"MapTasksRunning", "MapTasksRemaining", "MapSlotsOpen", "RemainingMapTasksPerSlot", "ReduceTasksRunning", "ReduceTasksRemaining", "ReduceSlotsOpen",
"CoreNodesRunning", "CoreNodesPending", "LiveDataNodes", "TaskNodesRunning", "TaskNodesPending", "LiveTaskTrackers",
@@ -54,55 +68,68 @@ func init() {
"CoreNodesRunning", "CoreNodesPending", "LiveDataNodes", "MRTotalNodes", "MRActiveNodes", "MRLostNodes", "MRUnhealthyNodes", "MRDecommissionedNodes", "MRRebootedNodes",
"S3BytesWritten", "S3BytesRead", "HDFSUtilization", "HDFSBytesRead", "HDFSBytesWritten", "MissingBlocks", "CorruptBlocks", "TotalLoad", "MemoryTotalMB", "MemoryReservedMB", "MemoryAvailableMB", "MemoryAllocatedMB", "PendingDeletionBlocks", "UnderReplicatedBlocks", "DfsPendingReplicationBlocks", "CapacityRemainingGB",
"HbaseBackupFailed", "MostRecentBackupDuration", "TimeSinceLastSuccessfulBackup"},
- "AWS/ES": {"ClusterStatus.green", "ClusterStatus.yellow", "ClusterStatus.red", "Nodes", "SearchableDocuments", "DeletedDocuments", "CPUUtilization", "FreeStorageSpace", "JVMMemoryPressure", "AutomatedSnapshotFailure", "MasterCPUUtilization", "MasterFreeStorageSpace", "MasterJVMMemoryPressure", "ReadLatency", "WriteLatency", "ReadThroughput", "WriteThroughput", "DiskQueueLength", "ReadIOPS", "WriteIOPS"},
- "AWS/Events": {"Invocations", "FailedInvocations", "TriggeredRules", "MatchedEvents", "ThrottledRules"},
- "AWS/Kinesis": {"PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Success", "PutRecords.Bytes", "PutRecords.Latency", "PutRecords.Records", "PutRecords.Success", "IncomingBytes", "IncomingRecords", "GetRecords.Bytes", "GetRecords.IteratorAgeMilliseconds", "GetRecords.Latency", "GetRecords.Success"},
- "AWS/Lambda": {"Invocations", "Errors", "Duration", "Throttles"},
- "AWS/Logs": {"IncomingBytes", "IncomingLogEvents", "ForwardedBytes", "ForwardedLogEvents", "DeliveryErrors", "DeliveryThrottling"},
- "AWS/ML": {"PredictCount", "PredictFailureCount"},
- "AWS/OpsWorks": {"cpu_idle", "cpu_nice", "cpu_system", "cpu_user", "cpu_waitio", "load_1", "load_5", "load_15", "memory_buffers", "memory_cached", "memory_free", "memory_swap", "memory_total", "memory_used", "procs"},
- "AWS/Redshift": {"CPUUtilization", "DatabaseConnections", "HealthStatus", "MaintenanceMode", "NetworkReceiveThroughput", "NetworkTransmitThroughput", "PercentageDiskSpaceUsed", "ReadIOPS", "ReadLatency", "ReadThroughput", "WriteIOPS", "WriteLatency", "WriteThroughput"},
- "AWS/RDS": {"BinLogDiskUsage", "CPUUtilization", "CPUCreditUsage", "CPUCreditBalance", "DatabaseConnections", "DiskQueueDepth", "FreeableMemory", "FreeStorageSpace", "ReplicaLag", "SwapUsage", "ReadIOPS", "WriteIOPS", "ReadLatency", "WriteLatency", "ReadThroughput", "WriteThroughput", "NetworkReceiveThroughput", "NetworkTransmitThroughput"},
- "AWS/Route53": {"HealthCheckStatus", "HealthCheckPercentageHealthy", "ConnectionTime", "SSLHandshakeTime", "TimeToFirstByte"},
- "AWS/SNS": {"NumberOfMessagesPublished", "PublishSize", "NumberOfNotificationsDelivered", "NumberOfNotificationsFailed"},
- "AWS/SQS": {"NumberOfMessagesSent", "SentMessageSize", "NumberOfMessagesReceived", "NumberOfEmptyReceives", "NumberOfMessagesDeleted", "ApproximateNumberOfMessagesDelayed", "ApproximateNumberOfMessagesVisible", "ApproximateNumberOfMessagesNotVisible"},
- "AWS/S3": {"BucketSizeBytes", "NumberOfObjects"},
- "AWS/SWF": {"DecisionTaskScheduleToStartTime", "DecisionTaskStartToCloseTime", "DecisionTasksCompleted", "StartedDecisionTasksTimedOutOnClose", "WorkflowStartToCloseTime", "WorkflowsCanceled", "WorkflowsCompleted", "WorkflowsContinuedAsNew", "WorkflowsFailed", "WorkflowsTerminated", "WorkflowsTimedOut",
- "ActivityTaskScheduleToCloseTime", "ActivityTaskScheduleToStartTime", "ActivityTaskStartToCloseTime", "ActivityTasksCanceled", "ActivityTasksCompleted", "ActivityTasksFailed", "ScheduledActivityTasksTimedOutOnClose", "ScheduledActivityTasksTimedOutOnStart", "StartedActivityTasksTimedOutOnClose", "StartedActivityTasksTimedOutOnHeartbeat"},
+ "AWS/ES": {"ClusterStatus.green", "ClusterStatus.yellow", "ClusterStatus.red", "Nodes", "SearchableDocuments", "DeletedDocuments", "CPUUtilization", "FreeStorageSpace", "JVMMemoryPressure", "AutomatedSnapshotFailure", "MasterCPUUtilization", "MasterFreeStorageSpace", "MasterJVMMemoryPressure", "ReadLatency", "WriteLatency", "ReadThroughput", "WriteThroughput", "DiskQueueLength", "ReadIOPS", "WriteIOPS"},
+ "AWS/Events": {"Invocations", "FailedInvocations", "TriggeredRules", "MatchedEvents", "ThrottledRules"},
+ "AWS/Firehose": {"DeliveryToElasticsearch.Bytes", "DeliveryToElasticsearch.Records", "DeliveryToElasticsearch.Success", "DeliveryToRedshift.Bytes", "DeliveryToRedshift.Records", "DeliveryToRedshift.Success", "DeliveryToS3.Bytes", "DeliveryToS3.DataFreshness", "DeliveryToS3.Records", "DeliveryToS3.Success", "IncomingBytes", "IncomingRecords", "DescribeDeliveryStream.Latency", "DescribeDeliveryStream.Requests", "ListDeliveryStreams.Latency", "ListDeliveryStreams.Requests", "PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Requests", "PutRecordBatch.Bytes", "PutRecordBatch.Latency", "PutRecordBatch.Records", "PutRecordBatch.Requests", "UpdateDeliveryStream.Latency", "UpdateDeliveryStream.Requests"},
+ "AWS/IoT": {"PublishIn.Success", "PublishOut.Success", "Subscribe.Success", "Ping.Success", "Connect.Success", "GetThingShadow.Accepted"},
+ "AWS/Kinesis": {"GetRecords.Bytes", "GetRecords.IteratorAge", "GetRecords.IteratorAgeMilliseconds", "GetRecords.Latency", "GetRecords.Records", "GetRecords.Success", "IncomingBytes", "IncomingRecords", "PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Success", "PutRecords.Bytes", "PutRecords.Latency", "PutRecords.Records", "PutRecords.Success", "ReadProvisionedThroughputExceeded", "WriteProvisionedThroughputExceeded", "IteratorAgeMilliseconds", "OutgoingBytes", "OutgoingRecords"},
+ "AWS/KinesisAnalytics": {"Bytes", "MillisBehindLatest", "Records", "Success"},
+ "AWS/Lambda": {"Invocations", "Errors", "Duration", "Throttles"},
+ "AWS/Logs": {"IncomingBytes", "IncomingLogEvents", "ForwardedBytes", "ForwardedLogEvents", "DeliveryErrors", "DeliveryThrottling"},
+ "AWS/ML": {"PredictCount", "PredictFailureCount"},
+ "AWS/OpsWorks": {"cpu_idle", "cpu_nice", "cpu_system", "cpu_user", "cpu_waitio", "load_1", "load_5", "load_15", "memory_buffers", "memory_cached", "memory_free", "memory_swap", "memory_total", "memory_used", "procs"},
+ "AWS/Redshift": {"CPUUtilization", "DatabaseConnections", "HealthStatus", "MaintenanceMode", "NetworkReceiveThroughput", "NetworkTransmitThroughput", "PercentageDiskSpaceUsed", "ReadIOPS", "ReadLatency", "ReadThroughput", "WriteIOPS", "WriteLatency", "WriteThroughput"},
+ "AWS/RDS": {"ActiveTransactions", "AuroraBinlogReplicaLag", "AuroraReplicaLag", "AuroraReplicaLagMaximum", "AuroraReplicaLagMinimum", "BinLogDiskUsage", "BlockedTransactions", "BufferCacheHitRatio", "CommitLatency", "CommitThroughput", "CPUCreditBalance", "CPUCreditUsage", "CPUUtilization", "DatabaseConnections", "DDLLatency", "DDLThroughput", "Deadlocks", "DiskQueueDepth", "DMLLatency", "DMLThroughput", "FailedSqlStatements", "FreeableMemory", "FreeStorageSpace", "LoginFailures", "NetworkReceiveThroughput", "NetworkTransmitThroughput", "ReadIOPS", "ReadLatency", "ReadThroughput", "ReplicaLag", "ResultSetCacheHitRatio", "SelectLatency", "SelectThroughput", "SwapUsage", "TotalConnections", "VolumeReadIOPS", "VolumeWriteIOPS", "WriteIOPS", "WriteLatency", "WriteThroughput"},
+ "AWS/Route53": {"HealthCheckStatus", "HealthCheckPercentageHealthy", "ConnectionTime", "SSLHandshakeTime", "TimeToFirstByte"},
+ "AWS/S3": {"BucketSizeBytes", "NumberOfObjects"},
+ "AWS/SNS": {"NumberOfMessagesPublished", "PublishSize", "NumberOfNotificationsDelivered", "NumberOfNotificationsFailed"},
+ "AWS/SQS": {"NumberOfMessagesSent", "SentMessageSize", "NumberOfMessagesReceived", "NumberOfEmptyReceives", "NumberOfMessagesDeleted", "ApproximateNumberOfMessagesDelayed", "ApproximateNumberOfMessagesVisible", "ApproximateNumberOfMessagesNotVisible"},
"AWS/StorageGateway": {"CacheHitPercent", "CachePercentUsed", "CachePercentDirty", "CloudBytesDownloaded", "CloudDownloadLatency", "CloudBytesUploaded", "UploadBufferFree", "UploadBufferPercentUsed", "UploadBufferUsed", "QueuedWrites", "ReadBytes", "ReadTime", "TotalCacheSize", "WriteBytes", "WriteTime", "TimeSinceLastRecoveryPoint", "WorkingStorageFree", "WorkingStoragePercentUsed", "WorkingStorageUsed",
"CacheHitPercent", "CachePercentUsed", "CachePercentDirty", "ReadBytes", "ReadTime", "WriteBytes", "WriteTime", "QueuedWrites"},
+ "AWS/SWF": {"DecisionTaskScheduleToStartTime", "DecisionTaskStartToCloseTime", "DecisionTasksCompleted", "StartedDecisionTasksTimedOutOnClose", "WorkflowStartToCloseTime", "WorkflowsCanceled", "WorkflowsCompleted", "WorkflowsContinuedAsNew", "WorkflowsFailed", "WorkflowsTerminated", "WorkflowsTimedOut",
+ "ActivityTaskScheduleToCloseTime", "ActivityTaskScheduleToStartTime", "ActivityTaskStartToCloseTime", "ActivityTasksCanceled", "ActivityTasksCompleted", "ActivityTasksFailed", "ScheduledActivityTasksTimedOutOnClose", "ScheduledActivityTasksTimedOutOnStart", "StartedActivityTasksTimedOutOnClose", "StartedActivityTasksTimedOutOnHeartbeat"},
"AWS/WAF": {"AllowedRequests", "BlockedRequests", "CountedRequests"},
"AWS/WorkSpaces": {"Available", "Unhealthy", "ConnectionAttempt", "ConnectionSuccess", "ConnectionFailure", "SessionLaunchTime", "InSessionLatency", "SessionDisconnect"},
+ "KMS": {"SecondsUntilKeyMaterialExpiration"},
}
dimensionsMap = map[string][]string{
+ "AWS/ApiGateway": {"ApiName", "Method", "Resource", "Stage"},
+ "AWS/ApplicationELB": {"LoadBalancer", "TargetGroup", "AvailabilityZone"},
"AWS/AutoScaling": {"AutoScalingGroupName"},
"AWS/Billing": {"ServiceName", "LinkedAccount", "Currency"},
"AWS/CloudFront": {"DistributionId", "Region"},
"AWS/CloudSearch": {},
- "AWS/DynamoDB": {"TableName", "GlobalSecondaryIndexName", "Operation"},
- "AWS/ECS": {"ClusterName", "ServiceName"},
- "AWS/ElastiCache": {"CacheClusterId", "CacheNodeId"},
+ "AWS/DynamoDB": {"TableName", "GlobalSecondaryIndexName", "Operation", "StreamLabel"},
"AWS/EBS": {"VolumeId"},
"AWS/EC2": {"AutoScalingGroupName", "ImageId", "InstanceId", "InstanceType"},
+ "AWS/EC2Spot": {"AvailabilityZone", "FleetRequestId", "InstanceType"},
+ "AWS/ECS": {"ClusterName", "ServiceName"},
+ "AWS/EFS": {"FileSystemId"},
"AWS/ELB": {"LoadBalancerName", "AvailabilityZone"},
+ "AWS/ElastiCache": {"CacheClusterId", "CacheNodeId"},
+ "AWS/ElasticBeanstalk": {"EnvironmentName", "InstanceId"},
"AWS/ElasticMapReduce": {"ClusterId", "JobFlowId", "JobId"},
- "AWS/ES": {},
+ "AWS/ES": {"ClientId", "DomainName"},
"AWS/Events": {"RuleName"},
- "AWS/Kinesis": {"StreamName"},
- "AWS/Lambda": {"FunctionName"},
+ "AWS/Firehose": {},
+ "AWS/IoT": {"Protocol"},
+ "AWS/Kinesis": {"StreamName", "ShardID"},
+ "AWS/KinesisAnalytics": {"Flow", "Id", "Application"},
+ "AWS/Lambda": {"FunctionName", "Resource", "Version", "Alias"},
"AWS/Logs": {"LogGroupName", "DestinationType", "FilterName"},
"AWS/ML": {"MLModelId", "RequestMode"},
"AWS/OpsWorks": {"StackId", "LayerId", "InstanceId"},
"AWS/Redshift": {"NodeID", "ClusterIdentifier"},
- "AWS/RDS": {"DBInstanceIdentifier", "DatabaseClass", "EngineName"},
+ "AWS/RDS": {"DBInstanceIdentifier", "DBClusterIdentifier", "DatabaseClass", "EngineName"},
"AWS/Route53": {"HealthCheckId"},
+ "AWS/S3": {"BucketName", "StorageType"},
"AWS/SNS": {"Application", "Platform", "TopicName"},
"AWS/SQS": {"QueueName"},
- "AWS/S3": {"BucketName", "StorageType"},
- "AWS/SWF": {"Domain", "WorkflowTypeName", "WorkflowTypeVersion", "ActivityTypeName", "ActivityTypeVersion"},
"AWS/StorageGateway": {"GatewayId", "GatewayName", "VolumeId"},
+ "AWS/SWF": {"Domain", "WorkflowTypeName", "WorkflowTypeVersion", "ActivityTypeName", "ActivityTypeVersion"},
"AWS/WAF": {"Rule", "WebACL"},
"AWS/WorkSpaces": {"DirectoryId", "WorkspaceId"},
+ "KMS": {"KeyId"},
}
customMetricsMetricsMap = make(map[string]map[string]map[string]*CustomMetricsCache)
@@ -113,8 +140,8 @@ func init() {
// Please update the region list in public/app/plugins/datasource/cloudwatch/partials/config.html
func handleGetRegions(req *cwRequest, c *middleware.Context) {
regions := []string{
- "ap-northeast-1", "ap-northeast-2", "ap-southeast-1", "ap-southeast-2", "cn-north-1",
- "eu-central-1", "eu-west-1", "sa-east-1", "us-east-1", "us-west-1", "us-west-2",
+ "ap-northeast-1", "ap-northeast-2", "ap-southeast-1", "ap-southeast-2", "ap-south-1", "ca-central-1", "cn-north-1",
+ "eu-central-1", "eu-west-1", "eu-west-2", "sa-east-1", "us-east-1", "us-east-2", "us-gov-west-1", "us-west-1", "us-west-2",
}
result := []interface{}{}
@@ -166,7 +193,10 @@ func handleGetMetrics(req *cwRequest, c *middleware.Context) {
}
} else {
var err error
- if namespaceMetrics, err = getMetricsForCustomMetrics(req.Region, reqParam.Parameters.Namespace, req.DataSource.Database, getAllMetrics); err != nil {
+ cwData := req.GetDatasourceInfo()
+ cwData.Namespace = reqParam.Parameters.Namespace
+
+ if namespaceMetrics, err = getMetricsForCustomMetrics(cwData, getAllMetrics); err != nil {
c.JsonApiErr(500, "Unable to call AWS API", err)
return
}
@@ -199,7 +229,10 @@ func handleGetDimensions(req *cwRequest, c *middleware.Context) {
}
} else {
var err error
- if dimensionValues, err = getDimensionsForCustomMetrics(req.Region, reqParam.Parameters.Namespace, req.DataSource.Database, getAllMetrics); err != nil {
+ dsInfo := req.GetDatasourceInfo()
+ dsInfo.Namespace = reqParam.Parameters.Namespace
+
+ if dimensionValues, err = getDimensionsForCustomMetrics(dsInfo, getAllMetrics); err != nil {
c.JsonApiErr(500, "Unable to call AWS API", err)
return
}
@@ -214,21 +247,26 @@ func handleGetDimensions(req *cwRequest, c *middleware.Context) {
c.JSON(200, result)
}
-func getAllMetrics(region string, namespace string, database string) (cloudwatch.ListMetricsOutput, error) {
+func getAllMetrics(cwData *datasourceInfo) (cloudwatch.ListMetricsOutput, error) {
+ creds, err := getCredentials(cwData)
+ if err != nil {
+ return cloudwatch.ListMetricsOutput{}, err
+ }
cfg := &aws.Config{
- Region: aws.String(region),
- Credentials: getCredentials(database),
+ Region: aws.String(cwData.Region),
+ Credentials: creds,
}
svc := cloudwatch.New(session.New(cfg), cfg)
params := &cloudwatch.ListMetricsInput{
- Namespace: aws.String(namespace),
+ Namespace: aws.String(cwData.Namespace),
}
var resp cloudwatch.ListMetricsOutput
- err := svc.ListMetricsPages(params,
+ err = svc.ListMetricsPages(params,
func(page *cloudwatch.ListMetricsOutput, lastPage bool) bool {
+ metrics.M_Aws_CloudWatch_ListMetrics.Inc(1)
metrics, _ := awsutil.ValuesAtPath(page, "Metrics")
for _, metric := range metrics {
resp.Metrics = append(resp.Metrics, metric.(*cloudwatch.Metric))
@@ -244,8 +282,8 @@ func getAllMetrics(region string, namespace string, database string) (cloudwatch
var metricsCacheLock sync.Mutex
-func getMetricsForCustomMetrics(region string, namespace string, database string, getAllMetrics func(string, string, string) (cloudwatch.ListMetricsOutput, error)) ([]string, error) {
- result, err := getAllMetrics(region, namespace, database)
+func getMetricsForCustomMetrics(dsInfo *datasourceInfo, getAllMetrics func(*datasourceInfo) (cloudwatch.ListMetricsOutput, error)) ([]string, error) {
+ result, err := getAllMetrics(dsInfo)
if err != nil {
return []string{}, err
}
@@ -253,37 +291,37 @@ func getMetricsForCustomMetrics(region string, namespace string, database string
metricsCacheLock.Lock()
defer metricsCacheLock.Unlock()
- if _, ok := customMetricsMetricsMap[database]; !ok {
- customMetricsMetricsMap[database] = make(map[string]map[string]*CustomMetricsCache)
+ if _, ok := customMetricsMetricsMap[dsInfo.Profile]; !ok {
+ customMetricsMetricsMap[dsInfo.Profile] = make(map[string]map[string]*CustomMetricsCache)
}
- if _, ok := customMetricsMetricsMap[database][region]; !ok {
- customMetricsMetricsMap[database][region] = make(map[string]*CustomMetricsCache)
+ if _, ok := customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region]; !ok {
+ customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region] = make(map[string]*CustomMetricsCache)
}
- if _, ok := customMetricsMetricsMap[database][region][namespace]; !ok {
- customMetricsMetricsMap[database][region][namespace] = &CustomMetricsCache{}
- customMetricsMetricsMap[database][region][namespace].Cache = make([]string, 0)
+ if _, ok := customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace]; !ok {
+ customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace] = &CustomMetricsCache{}
+ customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = make([]string, 0)
}
- if customMetricsMetricsMap[database][region][namespace].Expire.After(time.Now()) {
- return customMetricsMetricsMap[database][region][namespace].Cache, nil
+ if customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Expire.After(time.Now()) {
+ return customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, nil
}
- customMetricsMetricsMap[database][region][namespace].Cache = make([]string, 0)
- customMetricsMetricsMap[database][region][namespace].Expire = time.Now().Add(5 * time.Minute)
+ customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = make([]string, 0)
+ customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Expire = time.Now().Add(5 * time.Minute)
for _, metric := range result.Metrics {
- if isDuplicate(customMetricsMetricsMap[database][region][namespace].Cache, *metric.MetricName) {
+ if isDuplicate(customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, *metric.MetricName) {
continue
}
- customMetricsMetricsMap[database][region][namespace].Cache = append(customMetricsMetricsMap[database][region][namespace].Cache, *metric.MetricName)
+ customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = append(customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, *metric.MetricName)
}
- return customMetricsMetricsMap[database][region][namespace].Cache, nil
+ return customMetricsMetricsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, nil
}
var dimensionsCacheLock sync.Mutex
-func getDimensionsForCustomMetrics(region string, namespace string, database string, getAllMetrics func(string, string, string) (cloudwatch.ListMetricsOutput, error)) ([]string, error) {
- result, err := getAllMetrics(region, namespace, database)
+func getDimensionsForCustomMetrics(dsInfo *datasourceInfo, getAllMetrics func(*datasourceInfo) (cloudwatch.ListMetricsOutput, error)) ([]string, error) {
+ result, err := getAllMetrics(dsInfo)
if err != nil {
return []string{}, err
}
@@ -291,33 +329,33 @@ func getDimensionsForCustomMetrics(region string, namespace string, database str
dimensionsCacheLock.Lock()
defer dimensionsCacheLock.Unlock()
- if _, ok := customMetricsDimensionsMap[database]; !ok {
- customMetricsDimensionsMap[database] = make(map[string]map[string]*CustomMetricsCache)
+ if _, ok := customMetricsDimensionsMap[dsInfo.Profile]; !ok {
+ customMetricsDimensionsMap[dsInfo.Profile] = make(map[string]map[string]*CustomMetricsCache)
}
- if _, ok := customMetricsDimensionsMap[database][region]; !ok {
- customMetricsDimensionsMap[database][region] = make(map[string]*CustomMetricsCache)
+ if _, ok := customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region]; !ok {
+ customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region] = make(map[string]*CustomMetricsCache)
}
- if _, ok := customMetricsDimensionsMap[database][region][namespace]; !ok {
- customMetricsDimensionsMap[database][region][namespace] = &CustomMetricsCache{}
- customMetricsDimensionsMap[database][region][namespace].Cache = make([]string, 0)
+ if _, ok := customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace]; !ok {
+ customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace] = &CustomMetricsCache{}
+ customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = make([]string, 0)
}
- if customMetricsDimensionsMap[database][region][namespace].Expire.After(time.Now()) {
- return customMetricsDimensionsMap[database][region][namespace].Cache, nil
+ if customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Expire.After(time.Now()) {
+ return customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, nil
}
- customMetricsDimensionsMap[database][region][namespace].Cache = make([]string, 0)
- customMetricsDimensionsMap[database][region][namespace].Expire = time.Now().Add(5 * time.Minute)
+ customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = make([]string, 0)
+ customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Expire = time.Now().Add(5 * time.Minute)
for _, metric := range result.Metrics {
for _, dimension := range metric.Dimensions {
- if isDuplicate(customMetricsDimensionsMap[database][region][namespace].Cache, *dimension.Name) {
+ if isDuplicate(customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, *dimension.Name) {
continue
}
- customMetricsDimensionsMap[database][region][namespace].Cache = append(customMetricsDimensionsMap[database][region][namespace].Cache, *dimension.Name)
+ customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache = append(customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, *dimension.Name)
}
}
- return customMetricsDimensionsMap[database][region][namespace].Cache, nil
+ return customMetricsDimensionsMap[dsInfo.Profile][dsInfo.Region][dsInfo.Namespace].Cache, nil
}
func isDuplicate(nameList []string, target string) bool {
diff --git a/pkg/api/cloudwatch/metrics_test.go b/pkg/api/cloudwatch/metrics_test.go
index ec39452e116..4ac8a70a273 100644
--- a/pkg/api/cloudwatch/metrics_test.go
+++ b/pkg/api/cloudwatch/metrics_test.go
@@ -11,10 +11,13 @@ import (
func TestCloudWatchMetrics(t *testing.T) {
Convey("When calling getMetricsForCustomMetrics", t, func() {
- region := "us-east-1"
- namespace := "Foo"
- database := "default"
- f := func(region string, namespace string, database string) (cloudwatch.ListMetricsOutput, error) {
+ dsInfo := &datasourceInfo{
+ Region: "us-east-1",
+ Namespace: "Foo",
+ Profile: "default",
+ AssumeRoleArn: "",
+ }
+ f := func(dsInfo *datasourceInfo) (cloudwatch.ListMetricsOutput, error) {
return cloudwatch.ListMetricsOutput{
Metrics: []*cloudwatch.Metric{
{
@@ -28,7 +31,7 @@ func TestCloudWatchMetrics(t *testing.T) {
},
}, nil
}
- metrics, _ := getMetricsForCustomMetrics(region, namespace, database, f)
+ metrics, _ := getMetricsForCustomMetrics(dsInfo, f)
Convey("Should contain Test_MetricName", func() {
So(metrics, ShouldContain, "Test_MetricName")
@@ -36,10 +39,13 @@ func TestCloudWatchMetrics(t *testing.T) {
})
Convey("When calling getDimensionsForCustomMetrics", t, func() {
- region := "us-east-1"
- namespace := "Foo"
- database := "default"
- f := func(region string, namespace string, database string) (cloudwatch.ListMetricsOutput, error) {
+ dsInfo := &datasourceInfo{
+ Region: "us-east-1",
+ Namespace: "Foo",
+ Profile: "default",
+ AssumeRoleArn: "",
+ }
+ f := func(dsInfo *datasourceInfo) (cloudwatch.ListMetricsOutput, error) {
return cloudwatch.ListMetricsOutput{
Metrics: []*cloudwatch.Metric{
{
@@ -53,7 +59,7 @@ func TestCloudWatchMetrics(t *testing.T) {
},
}, nil
}
- dimensionKeys, _ := getDimensionsForCustomMetrics(region, namespace, database, f)
+ dimensionKeys, _ := getDimensionsForCustomMetrics(dsInfo, f)
Convey("Should contain Test_DimensionName", func() {
So(dimensionKeys, ShouldContain, "Test_DimensionName")
diff --git a/pkg/api/common.go b/pkg/api/common.go
index 5a7d48a5cbe..bd1c8be477d 100644
--- a/pkg/api/common.go
+++ b/pkg/api/common.go
@@ -4,26 +4,30 @@ import (
"encoding/json"
"net/http"
- "github.com/grafana/grafana/pkg/log"
- "github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/setting"
"gopkg.in/macaron.v1"
)
var (
- NotFound = ApiError(404, "Not found", nil)
- ServerError = ApiError(500, "Server error", nil)
+ NotFound = func() Response {
+ return ApiError(404, "Not found", nil)
+ }
+ ServerError = func(err error) Response {
+ return ApiError(500, "Server error", err)
+ }
)
type Response interface {
- WriteTo(out http.ResponseWriter)
+ WriteTo(ctx *middleware.Context)
}
type NormalResponse struct {
- status int
- body []byte
- header http.Header
+ status int
+ body []byte
+ header http.Header
+ errMessage string
+ err error
}
func wrap(action interface{}) macaron.Handler {
@@ -34,20 +38,24 @@ func wrap(action interface{}) macaron.Handler {
if err == nil && val != nil && len(val) > 0 {
res = val[0].Interface().(Response)
} else {
- res = ServerError
+ res = ServerError(err)
}
- res.WriteTo(c.Resp)
+ res.WriteTo(c)
}
}
-func (r *NormalResponse) WriteTo(out http.ResponseWriter) {
- header := out.Header()
+func (r *NormalResponse) WriteTo(ctx *middleware.Context) {
+ if r.err != nil {
+ ctx.Logger.Error(r.errMessage, "error", r.err)
+ }
+
+ header := ctx.Resp.Header()
for k, v := range r.header {
header[k] = v
}
- out.WriteHeader(r.status)
- out.Write(r.body)
+ ctx.Resp.WriteHeader(r.status)
+ ctx.Resp.Write(r.body)
}
func (r *NormalResponse) Cache(ttl string) *NormalResponse {
@@ -60,7 +68,6 @@ func (r *NormalResponse) Header(key, value string) *NormalResponse {
}
// functions to create responses
-
func Empty(status int) *NormalResponse {
return Respond(status, nil)
}
@@ -72,33 +79,37 @@ func Json(status int, body interface{}) *NormalResponse {
func ApiSuccess(message string) *NormalResponse {
resp := make(map[string]interface{})
resp["message"] = message
- return Respond(200, resp)
+ return Json(200, resp)
}
func ApiError(status int, message string, err error) *NormalResponse {
- resp := make(map[string]interface{})
-
- if err != nil {
- log.Error(4, "%s: %v", message, err)
- if setting.Env != setting.PROD {
- resp["error"] = err.Error()
- }
- }
+ data := make(map[string]interface{})
switch status {
case 404:
- metrics.M_Api_Status_404.Inc(1)
- resp["message"] = "Not Found"
+ data["message"] = "Not Found"
case 500:
- metrics.M_Api_Status_500.Inc(1)
- resp["message"] = "Internal Server Error"
+ data["message"] = "Internal Server Error"
}
if message != "" {
- resp["message"] = message
+ data["message"] = message
}
- return Json(status, resp)
+ if err != nil {
+ if setting.Env != setting.PROD {
+ data["error"] = err.Error()
+ }
+ }
+
+ resp := Json(status, data)
+
+ if err != nil {
+ resp.errMessage = message
+ resp.err = err
+ }
+
+ return resp
}
func Respond(status int, body interface{}) *NormalResponse {
diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 22f9e1e22a1..55925c4faf6 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -8,9 +8,13 @@ import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/plugins"
+ "github.com/grafana/grafana/pkg/services/alerting"
"github.com/grafana/grafana/pkg/services/search"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
@@ -30,8 +34,6 @@ func isDashboardStarredByUser(c *middleware.Context, dashId int64) (bool, error)
}
func GetDashboard(c *middleware.Context) {
- metrics.M_Api_Dashboard_Get.Inc(1)
-
slug := strings.ToLower(c.Params(":slug"))
query := m.GetDashboardQuery{Slug: slug, OrgId: c.OrgId}
@@ -75,6 +77,7 @@ func GetDashboard(c *middleware.Context) {
},
}
+ c.TimeRequest(metrics.M_Api_Dashboard_Get)
c.JSON(200, dto)
}
@@ -109,7 +112,7 @@ func DeleteDashboard(c *middleware.Context) {
c.JSON(200, resp)
}
-func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) {
+func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response {
cmd.OrgId = c.OrgId
if !c.IsSignedIn {
@@ -119,51 +122,91 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) {
}
dash := cmd.GetDashboardModel()
+ // Check if Title is empty
+ if dash.Title == "" {
+ return ApiError(400, m.ErrDashboardTitleEmpty.Error(), nil)
+ }
if dash.Id == 0 {
limitReached, err := middleware.QuotaReached(c, "dashboard")
if err != nil {
- c.JsonApiErr(500, "failed to get quota", err)
- return
+ return ApiError(500, "failed to get quota", err)
}
if limitReached {
- c.JsonApiErr(403, "Quota reached", nil)
- return
+ return ApiError(403, "Quota reached", nil)
}
}
+ validateAlertsCmd := alerting.ValidateDashboardAlertsCommand{
+ OrgId: c.OrgId,
+ UserId: c.UserId,
+ Dashboard: dash,
+ }
+
+ if err := bus.Dispatch(&validateAlertsCmd); err != nil {
+ return ApiError(500, "Invalid alert data. Cannot save dashboard", err)
+ }
+
err := bus.Dispatch(&cmd)
if err != nil {
if err == m.ErrDashboardWithSameNameExists {
- c.JSON(412, util.DynMap{"status": "name-exists", "message": err.Error()})
- return
+ return Json(412, util.DynMap{"status": "name-exists", "message": err.Error()})
}
if err == m.ErrDashboardVersionMismatch {
- c.JSON(412, util.DynMap{"status": "version-mismatch", "message": err.Error()})
- return
+ return Json(412, util.DynMap{"status": "version-mismatch", "message": err.Error()})
+ }
+ if pluginErr, ok := err.(m.UpdatePluginDashboardError); ok {
+ message := "The dashboard belongs to plugin " + pluginErr.PluginId + "."
+ // look up plugin name
+ if pluginDef, exist := plugins.Plugins[pluginErr.PluginId]; exist {
+ message = "The dashboard belongs to plugin " + pluginDef.Name + "."
+ }
+ return Json(412, util.DynMap{"status": "plugin-dashboard", "message": message})
}
if err == m.ErrDashboardNotFound {
- c.JSON(404, util.DynMap{"status": "not-found", "message": err.Error()})
- return
+ return Json(404, util.DynMap{"status": "not-found", "message": err.Error()})
}
- c.JsonApiErr(500, "Failed to save dashboard", err)
- return
+ return ApiError(500, "Failed to save dashboard", err)
}
- metrics.M_Api_Dashboard_Post.Inc(1)
+ alertCmd := alerting.UpdateDashboardAlertsCommand{
+ OrgId: c.OrgId,
+ UserId: c.UserId,
+ Dashboard: cmd.Result,
+ }
- c.JSON(200, util.DynMap{"status": "success", "slug": cmd.Result.Slug, "version": cmd.Result.Version})
+ if err := bus.Dispatch(&alertCmd); err != nil {
+ return ApiError(500, "Failed to save alerts", err)
+ }
+
+ c.TimeRequest(metrics.M_Api_Dashboard_Save)
+ return Json(200, util.DynMap{"status": "success", "slug": cmd.Result.Slug, "version": cmd.Result.Version})
}
func canEditDashboard(role m.RoleType) bool {
return role == m.ROLE_ADMIN || role == m.ROLE_EDITOR || role == m.ROLE_READ_ONLY_EDITOR
}
-func GetHomeDashboard(c *middleware.Context) {
+func GetHomeDashboard(c *middleware.Context) Response {
+ prefsQuery := m.GetPreferencesWithDefaultsQuery{OrgId: c.OrgId, UserId: c.UserId}
+ if err := bus.Dispatch(&prefsQuery); err != nil {
+ return ApiError(500, "Failed to get preferences", err)
+ }
+
+ if prefsQuery.Result.HomeDashboardId != 0 {
+ slugQuery := m.GetDashboardSlugByIdQuery{Id: prefsQuery.Result.HomeDashboardId}
+ err := bus.Dispatch(&slugQuery)
+ if err == nil {
+ dashRedirect := dtos.DashboardRedirect{RedirectUri: "db/" + slugQuery.Result}
+ return Json(200, &dashRedirect)
+ } else {
+ log.Warn("Failed to get slug from database, %s", err.Error())
+ }
+ }
+
filePath := path.Join(setting.StaticRootPath, "dashboards/home.json")
file, err := os.Open(filePath)
if err != nil {
- c.JsonApiErr(500, "Failed to load home dashboard", err)
- return
+ return ApiError(500, "Failed to load home dashboard", err)
}
dash := dtos.DashboardFullWithMeta{}
@@ -171,11 +214,29 @@ func GetHomeDashboard(c *middleware.Context) {
dash.Meta.CanEdit = canEditDashboard(c.OrgRole)
jsonParser := json.NewDecoder(file)
if err := jsonParser.Decode(&dash.Dashboard); err != nil {
- c.JsonApiErr(500, "Failed to load home dashboard", err)
- return
+ return ApiError(500, "Failed to load home dashboard", err)
}
- c.JSON(200, &dash)
+ if c.HasUserRole(m.ROLE_ADMIN) && !c.HasHelpFlag(m.HelpFlagGettingStartedPanelDismissed) {
+ addGettingStartedPanelToHomeDashboard(dash.Dashboard)
+ }
+
+ return Json(200, &dash)
+}
+
+func addGettingStartedPanelToHomeDashboard(dash *simplejson.Json) {
+ rows := dash.Get("rows").MustArray()
+ row := simplejson.NewFromAny(rows[0])
+
+ newpanel := simplejson.NewFromAny(map[string]interface{}{
+ "type": "gettingstarted",
+ "id": 123123,
+ "span": 12,
+ })
+
+ panels := row.Get("panels").MustArray()
+ panels = append(panels, newpanel)
+ row.Set("panels", panels)
}
func GetDashboardFromJsonFile(c *middleware.Context) {
diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go
index 3c369ca5b7f..cdcb871314d 100644
--- a/pkg/api/dashboard_snapshot.go
+++ b/pkg/api/dashboard_snapshot.go
@@ -21,6 +21,10 @@ func GetSharingOptions(c *middleware.Context) {
}
func CreateDashboardSnapshot(c *middleware.Context, cmd m.CreateDashboardSnapshotCommand) {
+ if cmd.Name == "" {
+ cmd.Name = "Unnamed snapshot"
+ }
+
if cmd.External {
// external snapshot ref requires key and delete key
if cmd.Key == "" || cmd.DeleteKey == "" {
diff --git a/pkg/api/dataproxy.go b/pkg/api/dataproxy.go
index eb88045cd51..db4c5166feb 100644
--- a/pkg/api/dataproxy.go
+++ b/pkg/api/dataproxy.go
@@ -1,8 +1,6 @@
package api
import (
- "crypto/tls"
- "net"
"net/http"
"net/http/httputil"
"net/url"
@@ -10,22 +8,13 @@ import (
"github.com/grafana/grafana/pkg/api/cloudwatch"
"github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
)
-var dataProxyTransport = &http.Transport{
- TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
- Proxy: http.ProxyFromEnvironment,
- Dial: (&net.Dialer{
- Timeout: 30 * time.Second,
- KeepAlive: 30 * time.Second,
- }).Dial,
- TLSHandshakeTimeout: 10 * time.Second,
-}
-
func NewReverseProxy(ds *m.DataSource, proxyPath string, targetUrl *url.URL) *httputil.ReverseProxy {
director := func(req *http.Request) {
req.URL.Scheme = targetUrl.Scheme
@@ -41,7 +30,6 @@ func NewReverseProxy(ds *m.DataSource, proxyPath string, targetUrl *url.URL) *ht
req.URL.RawQuery = reqQueryVals.Encode()
} else if ds.Type == m.DS_INFLUXDB {
req.URL.Path = util.JoinUrlFragments(targetUrl.Path, proxyPath)
- reqQueryVals.Add("db", ds.Database)
req.URL.RawQuery = reqQueryVals.Encode()
if !ds.BasicAuth {
req.Header.Del("Authorization")
@@ -56,6 +44,13 @@ func NewReverseProxy(ds *m.DataSource, proxyPath string, targetUrl *url.URL) *ht
req.Header.Add("Authorization", util.GetBasicAuthHeader(ds.BasicAuthUser, ds.BasicAuthPassword))
}
+ dsAuth := req.Header.Get("X-DS-Authorization")
+ if len(dsAuth) > 0 {
+ req.Header.Del("X-DS-Authorization")
+ req.Header.Del("Authorization")
+ req.Header.Add("Authorization", dsAuth)
+ }
+
// clear cookie headers
req.Header.Del("Cookie")
req.Header.Del("Set-Cookie")
@@ -70,16 +65,31 @@ func getDatasource(id int64, orgId int64) (*m.DataSource, error) {
return nil, err
}
- return &query.Result, nil
+ return query.Result, nil
}
func ProxyDataSourceRequest(c *middleware.Context) {
+ c.TimeRequest(metrics.M_DataSource_ProxyReq_Timer)
+
ds, err := getDatasource(c.ParamsInt64(":id"), c.OrgId)
+
if err != nil {
c.JsonApiErr(500, "Unable to load datasource meta data", err)
return
}
+ if ds.Type == m.DS_CLOUDWATCH {
+ cloudwatch.HandleRequest(c, ds)
+ return
+ }
+
+ if ds.Type == m.DS_INFLUXDB {
+ if c.Query("db") != ds.Database {
+ c.JsonApiErr(403, "Datasource is not configured to allow this database", nil)
+ return
+ }
+ }
+
targetUrl, _ := url.Parse(ds.Url)
if len(setting.DataProxyWhiteList) > 0 {
if _, exists := setting.DataProxyWhiteList[targetUrl.Host]; !exists {
@@ -88,13 +98,29 @@ func ProxyDataSourceRequest(c *middleware.Context) {
}
}
- if ds.Type == m.DS_CLOUDWATCH {
- cloudwatch.HandleRequest(c, ds)
- } else {
- proxyPath := c.Params("*")
- proxy := NewReverseProxy(ds, proxyPath, targetUrl)
- proxy.Transport = dataProxyTransport
- proxy.ServeHTTP(c.Resp, c.Req.Request)
- c.Resp.Header().Del("Set-Cookie")
+ proxyPath := c.Params("*")
+
+ if ds.Type == m.DS_ES {
+ if c.Req.Request.Method == "DELETE" {
+ c.JsonApiErr(403, "Deletes not allowed on proxied Elasticsearch datasource", nil)
+ return
+ }
+ if c.Req.Request.Method == "PUT" {
+ c.JsonApiErr(403, "Puts not allowed on proxied Elasticsearch datasource", nil)
+ return
+ }
+ if c.Req.Request.Method == "POST" && proxyPath != "_msearch" {
+ c.JsonApiErr(403, "Posts not allowed on proxied Elasticsearch datasource except on /_msearch", nil)
+ return
+ }
}
+
+ proxy := NewReverseProxy(ds, proxyPath, targetUrl)
+ proxy.Transport, err = ds.GetHttpTransport()
+ if err != nil {
+ c.JsonApiErr(400, "Unable to load TLS certificate", err)
+ return
+ }
+ proxy.ServeHTTP(c.Resp, c.Req.Request)
+ c.Resp.Header().Del("Set-Cookie")
}
diff --git a/pkg/api/dataproxy_test.go b/pkg/api/dataproxy_test.go
index 0e561c726e1..f3ed6994cff 100644
--- a/pkg/api/dataproxy_test.go
+++ b/pkg/api/dataproxy_test.go
@@ -11,11 +11,16 @@ import (
)
func TestDataSourceProxy(t *testing.T) {
-
Convey("When getting graphite datasource proxy", t, func() {
ds := m.DataSource{Url: "htttp://graphite:8080", Type: m.DS_GRAPHITE}
- targetUrl, _ := url.Parse(ds.Url)
+ targetUrl, err := url.Parse(ds.Url)
proxy := NewReverseProxy(&ds, "/render", targetUrl)
+ proxy.Transport, err = ds.GetHttpTransport()
+ So(err, ShouldBeNil)
+
+ transport, ok := proxy.Transport.(*http.Transport)
+ So(ok, ShouldBeTrue)
+ So(transport.TLSClientConfig.InsecureSkipVerify, ShouldBeTrue)
requestUrl, _ := url.Parse("http://grafana.com/sub")
req := http.Request{URL: requestUrl}
@@ -54,7 +59,5 @@ func TestDataSourceProxy(t *testing.T) {
So(queryVals["u"][0], ShouldEqual, "user")
So(queryVals["p"][0], ShouldEqual, "password")
})
-
})
-
}
diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index 63c2ec57b7a..43f4d308ed6 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -5,10 +5,9 @@ import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
- "github.com/grafana/grafana/pkg/plugins"
- //"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/util"
)
@@ -22,7 +21,6 @@ func GetDataSources(c *middleware.Context) {
result := make(dtos.DataSourceList, 0)
for _, ds := range query.Result {
-
dsItem := dtos.DataSource{
Id: ds.Id,
OrgId: ds.OrgId,
@@ -35,6 +33,7 @@ func GetDataSources(c *middleware.Context) {
User: ds.User,
BasicAuth: ds.BasicAuth,
IsDefault: ds.IsDefault,
+ JsonData: ds.JsonData,
}
if plugin, exists := plugins.DataSources[ds.Type]; exists {
@@ -92,24 +91,68 @@ func AddDataSource(c *middleware.Context, cmd m.AddDataSourceCommand) {
cmd.OrgId = c.OrgId
if err := bus.Dispatch(&cmd); err != nil {
+ if err == m.ErrDataSourceNameExists {
+ c.JsonApiErr(409, err.Error(), err)
+ return
+ }
+
c.JsonApiErr(500, "Failed to add datasource", err)
return
}
- c.JSON(200, util.DynMap{"message": "Datasource added", "id": cmd.Result.Id})
+ c.JSON(200, util.DynMap{"message": "Datasource added", "id": cmd.Result.Id, "name": cmd.Result.Name})
}
-func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) {
+func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) Response {
cmd.OrgId = c.OrgId
cmd.Id = c.ParamsInt64(":id")
- err := bus.Dispatch(&cmd)
+ err := fillWithSecureJsonData(&cmd)
if err != nil {
- c.JsonApiErr(500, "Failed to update datasource", err)
- return
+ return ApiError(500, "Failed to update datasource", err)
}
- c.JsonOK("Datasource updated")
+ err = bus.Dispatch(&cmd)
+ if err != nil {
+ return ApiError(500, "Failed to update datasource", err)
+ }
+
+ return Json(200, util.DynMap{"message": "Datasource updated", "id": cmd.Id, "name": cmd.Name})
+}
+
+func fillWithSecureJsonData(cmd *m.UpdateDataSourceCommand) error {
+ if len(cmd.SecureJsonData) == 0 {
+ return nil
+ }
+
+ ds, err := getRawDataSourceById(cmd.Id, cmd.OrgId)
+
+ if err != nil {
+ return err
+ }
+ secureJsonData := ds.SecureJsonData.Decrypt()
+
+ for k, v := range secureJsonData {
+
+ if _, ok := cmd.SecureJsonData[k]; !ok {
+ cmd.SecureJsonData[k] = v
+ }
+ }
+
+ return nil
+}
+
+func getRawDataSourceById(id int64, orgId int64) (*m.DataSource, error) {
+ query := m.GetDataSourceByIdQuery{
+ Id: id,
+ OrgId: orgId,
+ }
+
+ if err := bus.Dispatch(&query); err != nil {
+ return nil, err
+ }
+
+ return query.Result, nil
}
// Get /api/datasources/name/:name
@@ -123,9 +166,7 @@ func GetDataSourceByName(c *middleware.Context) Response {
return ApiError(500, "Failed to query datasources", err)
}
- ds := query.Result
- dtos := convertModelToDtos(ds)
-
+ dtos := convertModelToDtos(query.Result)
return Json(200, &dtos)
}
@@ -148,8 +189,8 @@ func GetDataSourceIdByName(c *middleware.Context) Response {
return Json(200, &dtos)
}
-func convertModelToDtos(ds m.DataSource) dtos.DataSource {
- return dtos.DataSource{
+func convertModelToDtos(ds *m.DataSource) dtos.DataSource {
+ dto := dtos.DataSource{
Id: ds.Id,
OrgId: ds.OrgId,
Name: ds.Name,
@@ -165,5 +206,14 @@ func convertModelToDtos(ds m.DataSource) dtos.DataSource {
WithCredentials: ds.WithCredentials,
IsDefault: ds.IsDefault,
JsonData: ds.JsonData,
+ SecureJsonFields: map[string]bool{},
}
+
+ for k, v := range ds.SecureJsonData {
+ if len(v) > 0 {
+ dto.SecureJsonFields[k] = true
+ }
+ }
+
+ return dto
}
diff --git a/pkg/api/dtos/alerting.go b/pkg/api/dtos/alerting.go
new file mode 100644
index 00000000000..f3d64f89524
--- /dev/null
+++ b/pkg/api/dtos/alerting.go
@@ -0,0 +1,70 @@
+package dtos
+
+import (
+ "time"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+)
+
+type AlertRule struct {
+ Id int64 `json:"id"`
+ DashboardId int64 `json:"dashboardId"`
+ PanelId int64 `json:"panelId"`
+ Name string `json:"name"`
+ Message string `json:"message"`
+ State m.AlertStateType `json:"state"`
+ NewStateDate time.Time `json:"newStateDate"`
+ EvalDate time.Time `json:"evalDate"`
+ ExecutionError string `json:"executionError"`
+ DashbboardUri string `json:"dashboardUri"`
+}
+
+type AlertNotification struct {
+ Id int64 `json:"id"`
+ Name string `json:"name"`
+ Type string `json:"type"`
+ IsDefault bool `json:"isDefault"`
+ Created time.Time `json:"created"`
+ Updated time.Time `json:"updated"`
+}
+
+type AlertTestCommand struct {
+ Dashboard *simplejson.Json `json:"dashboard" binding:"Required"`
+ PanelId int64 `json:"panelId" binding:"Required"`
+}
+
+type AlertTestResult struct {
+ Firing bool `json:"firing"`
+ ConditionEvals string `json:"conditionEvals"`
+ TimeMs string `json:"timeMs"`
+ Error string `json:"error,omitempty"`
+ EvalMatches []*EvalMatch `json:"matches,omitempty"`
+ Logs []*AlertTestResultLog `json:"logs,omitempty"`
+}
+
+type AlertTestResultLog struct {
+ Message string `json:"message"`
+ Data interface{} `json:"data"`
+}
+
+type EvalMatch struct {
+ Tags map[string]string `json:"tags,omitempty"`
+ Metric string `json:"metric"`
+ Value float64 `json:"value"`
+}
+
+type NotificationTestCommand struct {
+ Name string `json:"name"`
+ Type string `json:"type"`
+ Settings *simplejson.Json `json:"settings"`
+}
+
+type PauseAlertCommand struct {
+ AlertId int64 `json:"alertId"`
+ Paused bool `json:"paused"`
+}
+
+type PauseAllAlertsCommand struct {
+ Paused bool `json:"paused"`
+}
diff --git a/pkg/api/dtos/annotations.go b/pkg/api/dtos/annotations.go
new file mode 100644
index 00000000000..45415978ee1
--- /dev/null
+++ b/pkg/api/dtos/annotations.go
@@ -0,0 +1,23 @@
+package dtos
+
+import "github.com/grafana/grafana/pkg/components/simplejson"
+
+type Annotation struct {
+ AlertId int64 `json:"alertId"`
+ DashboardId int64 `json:"dashboardId"`
+ PanelId int64 `json:"panelId"`
+ NewState string `json:"newState"`
+ PrevState string `json:"prevState"`
+ Time int64 `json:"time"`
+ Title string `json:"title"`
+ Text string `json:"text"`
+ Metric string `json:"metric"`
+
+ Data *simplejson.Json `json:"data"`
+}
+
+type DeleteAnnotationsCmd struct {
+ AlertId int64 `json:"alertId"`
+ DashboardId int64 `json:"dashboardId"`
+ PanelId int64 `json:"panelId"`
+}
diff --git a/pkg/api/dtos/index.go b/pkg/api/dtos/index.go
index 21201d30adf..b813c78f2bb 100644
--- a/pkg/api/dtos/index.go
+++ b/pkg/api/dtos/index.go
@@ -1,13 +1,17 @@
package dtos
type IndexViewData struct {
- User *CurrentUser
- Settings map[string]interface{}
- AppUrl string
- AppSubUrl string
- GoogleAnalyticsId string
- GoogleTagManagerId string
- MainNavLinks []*NavLink
+ User *CurrentUser
+ Settings map[string]interface{}
+ AppUrl string
+ AppSubUrl string
+ GoogleAnalyticsId string
+ GoogleTagManagerId string
+ MainNavLinks []*NavLink
+ BuildVersion string
+ BuildCommit string
+ NewGrafanaVersionExists bool
+ NewGrafanaVersion string
}
type PluginCss struct {
diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go
index 8c1f85c9bd1..13dbe4ea32a 100644
--- a/pkg/api/dtos/models.go
+++ b/pkg/api/dtos/models.go
@@ -22,17 +22,20 @@ type LoginCommand struct {
}
type CurrentUser struct {
- IsSignedIn bool `json:"isSignedIn"`
- Id int64 `json:"id"`
- Login string `json:"login"`
- Email string `json:"email"`
- Name string `json:"name"`
- LightTheme bool `json:"lightTheme"`
- OrgId int64 `json:"orgId"`
- OrgName string `json:"orgName"`
- OrgRole m.RoleType `json:"orgRole"`
- IsGrafanaAdmin bool `json:"isGrafanaAdmin"`
- GravatarUrl string `json:"gravatarUrl"`
+ IsSignedIn bool `json:"isSignedIn"`
+ Id int64 `json:"id"`
+ Login string `json:"login"`
+ Email string `json:"email"`
+ Name string `json:"name"`
+ LightTheme bool `json:"lightTheme"`
+ OrgId int64 `json:"orgId"`
+ OrgName string `json:"orgName"`
+ OrgRole m.RoleType `json:"orgRole"`
+ IsGrafanaAdmin bool `json:"isGrafanaAdmin"`
+ GravatarUrl string `json:"gravatarUrl"`
+ Timezone string `json:"timezone"`
+ Locale string `json:"locale"`
+ HelpFlags1 m.HelpFlags1 `json:"helpFlags1"`
}
type DashboardMeta struct {
@@ -57,6 +60,10 @@ type DashboardFullWithMeta struct {
Dashboard *simplejson.Json `json:"dashboard"`
}
+type DashboardRedirect struct {
+ RedirectUri string `json:"redirectUri"`
+}
+
type DataSource struct {
Id int64 `json:"id"`
OrgId int64 `json:"orgId"`
@@ -74,6 +81,7 @@ type DataSource struct {
WithCredentials bool `json:"withCredentials"`
IsDefault bool `json:"isDefault"`
JsonData *simplejson.Json `json:"jsonData,omitempty"`
+ SecureJsonFields map[string]bool `json:"secureJsonFields"`
}
type DataSourceList []DataSource
@@ -90,13 +98,10 @@ func (slice DataSourceList) Swap(i, j int) {
slice[i], slice[j] = slice[j], slice[i]
}
-type MetricQueryResultDto struct {
- Data []MetricQueryResultDataDto `json:"data"`
-}
-
-type MetricQueryResultDataDto struct {
- Target string `json:"target"`
- DataPoints [][2]float64 `json:"datapoints"`
+type MetricRequest struct {
+ From string `json:"from"`
+ To string `json:"to"`
+ Queries []*simplejson.Json `json:"queries"`
}
type UserStars struct {
diff --git a/pkg/api/dtos/playlist.go b/pkg/api/dtos/playlist.go
new file mode 100644
index 00000000000..317ff83339a
--- /dev/null
+++ b/pkg/api/dtos/playlist.go
@@ -0,0 +1,23 @@
+package dtos
+
+type PlaylistDashboard struct {
+ Id int64 `json:"id"`
+ Slug string `json:"slug"`
+ Title string `json:"title"`
+ Uri string `json:"uri"`
+ Order int `json:"order"`
+}
+
+type PlaylistDashboardsSlice []PlaylistDashboard
+
+func (slice PlaylistDashboardsSlice) Len() int {
+ return len(slice)
+}
+
+func (slice PlaylistDashboardsSlice) Less(i, j int) bool {
+ return slice[i].Order < slice[j].Order
+}
+
+func (slice PlaylistDashboardsSlice) Swap(i, j int) {
+ slice[i], slice[j] = slice[j], slice[i]
+}
diff --git a/pkg/api/dtos/plugins.go b/pkg/api/dtos/plugins.go
index 53c911c10fa..70e732424ab 100644
--- a/pkg/api/dtos/plugins.go
+++ b/pkg/api/dtos/plugins.go
@@ -1,6 +1,9 @@
package dtos
-import "github.com/grafana/grafana/pkg/plugins"
+import (
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/plugins"
+)
type PluginSetting struct {
Name string `json:"name"`
@@ -15,15 +18,21 @@ type PluginSetting struct {
Dependencies *plugins.PluginDependencies `json:"dependencies"`
JsonData map[string]interface{} `json:"jsonData"`
DefaultNavUrl string `json:"defaultNavUrl"`
+
+ LatestVersion string `json:"latestVersion"`
+ HasUpdate bool `json:"hasUpdate"`
}
type PluginListItem struct {
- Name string `json:"name"`
- Type string `json:"type"`
- Id string `json:"id"`
- Enabled bool `json:"enabled"`
- Pinned bool `json:"pinned"`
- Info *plugins.PluginInfo `json:"info"`
+ Name string `json:"name"`
+ Type string `json:"type"`
+ Id string `json:"id"`
+ Enabled bool `json:"enabled"`
+ Pinned bool `json:"pinned"`
+ Info *plugins.PluginInfo `json:"info"`
+ LatestVersion string `json:"latestVersion"`
+ HasUpdate bool `json:"hasUpdate"`
+ DefaultNavUrl string `json:"defaultNavUrl"`
}
type PluginList []PluginListItem
@@ -43,6 +52,7 @@ func (slice PluginList) Swap(i, j int) {
type ImportDashboardCommand struct {
PluginId string `json:"pluginId"`
Path string `json:"path"`
- Reinstall bool `json:"reinstall"`
+ Overwrite bool `json:"overwrite"`
+ Dashboard *simplejson.Json `json:"dashboard"`
Inputs []plugins.ImportDashboardInput `json:"inputs"`
}
diff --git a/pkg/api/dtos/prefs.go b/pkg/api/dtos/prefs.go
new file mode 100644
index 00000000000..97e20bb4011
--- /dev/null
+++ b/pkg/api/dtos/prefs.go
@@ -0,0 +1,13 @@
+package dtos
+
+type Prefs struct {
+ Theme string `json:"theme"`
+ HomeDashboardId int64 `json:"homeDashboardId"`
+ Timezone string `json:"timezone"`
+}
+
+type UpdatePrefsCmd struct {
+ Theme string `json:"theme"`
+ HomeDashboardId int64 `json:"homeDashboardId"`
+ Timezone string `json:"timezone"`
+}
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index c84d7faccff..1fd4cd347e7 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -38,7 +38,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
url := ds.Url
if ds.Access == m.DS_ACCESS_PROXY {
- url = setting.AppSubUrl + "/api/datasources/proxy/" + strconv.FormatInt(ds.Id, 10)
+ url = "/api/datasources/proxy/" + strconv.FormatInt(ds.Id, 10)
}
var dsMap = map[string]interface{}{
@@ -59,7 +59,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
defaultDatasource = ds.Name
}
- if len(ds.JsonData.MustMap()) > 0 {
+ if ds.JsonData != nil {
dsMap["jsonData"] = ds.JsonData
}
@@ -105,6 +105,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
grafanaDatasourceMeta, _ := plugins.DataSources["grafana"]
datasources["-- Grafana --"] = map[string]interface{}{
"type": "grafana",
+ "name": "-- Grafana --",
"meta": grafanaDatasourceMeta,
}
@@ -121,11 +122,13 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
panels := map[string]interface{}{}
for _, panel := range enabledPlugins.Panels {
panels[panel.Id] = map[string]interface{}{
- "module": panel.Module,
- "baseUrl": panel.BaseUrl,
- "name": panel.Name,
- "id": panel.Id,
- "info": panel.Info,
+ "module": panel.Module,
+ "baseUrl": panel.BaseUrl,
+ "name": panel.Name,
+ "id": panel.Id,
+ "info": panel.Info,
+ "hideFromList": panel.HideFromList,
+ "sort": getPanelSort(panel.Id),
}
}
@@ -136,16 +139,39 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
"appSubUrl": setting.AppSubUrl,
"allowOrgCreate": (setting.AllowUserOrgCreate && c.IsSignedIn) || c.IsGrafanaAdmin,
"authProxyEnabled": setting.AuthProxyEnabled,
+ "ldapEnabled": setting.LdapEnabled,
"buildInfo": map[string]interface{}{
- "version": setting.BuildVersion,
- "commit": setting.BuildCommit,
- "buildstamp": setting.BuildStamp,
+ "version": setting.BuildVersion,
+ "commit": setting.BuildCommit,
+ "buildstamp": setting.BuildStamp,
+ "latestVersion": plugins.GrafanaLatestVersion,
+ "hasUpdate": plugins.GrafanaHasUpdate,
+ "env": setting.Env,
},
}
return jsonObj, nil
}
+func getPanelSort(id string) int {
+ sort := 100
+ switch id {
+ case "graph":
+ sort = 1
+ case "singlestat":
+ sort = 2
+ case "table":
+ sort = 3
+ case "text":
+ sort = 4
+ case "alertlist":
+ sort = 5
+ case "dashlist":
+ sort = 6
+ }
+ return sort
+}
+
func GetFrontendSettings(c *middleware.Context) {
settings, err := getFrontendSettingsMap(c)
if err != nil {
diff --git a/pkg/api/gnetproxy.go b/pkg/api/gnetproxy.go
new file mode 100644
index 00000000000..7761729b8af
--- /dev/null
+++ b/pkg/api/gnetproxy.go
@@ -0,0 +1,51 @@
+package api
+
+import (
+ "crypto/tls"
+ "net"
+ "net/http"
+ "net/http/httputil"
+ "net/url"
+ "time"
+
+ "github.com/grafana/grafana/pkg/middleware"
+ "github.com/grafana/grafana/pkg/setting"
+ "github.com/grafana/grafana/pkg/util"
+)
+
+var gNetProxyTransport = &http.Transport{
+ TLSClientConfig: &tls.Config{InsecureSkipVerify: false},
+ Proxy: http.ProxyFromEnvironment,
+ Dial: (&net.Dialer{
+ Timeout: 30 * time.Second,
+ KeepAlive: 30 * time.Second,
+ }).Dial,
+ TLSHandshakeTimeout: 10 * time.Second,
+}
+
+func ReverseProxyGnetReq(proxyPath string) *httputil.ReverseProxy {
+ url, _ := url.Parse(setting.GrafanaNetUrl)
+
+ director := func(req *http.Request) {
+ req.URL.Scheme = url.Scheme
+ req.URL.Host = url.Host
+ req.Host = url.Host
+
+ req.URL.Path = util.JoinUrlFragments(url.Path+"/api", proxyPath)
+
+ // clear cookie headers
+ req.Header.Del("Cookie")
+ req.Header.Del("Set-Cookie")
+ req.Header.Del("Authorization")
+ }
+
+ return &httputil.ReverseProxy{Director: director}
+}
+
+func ProxyGnetRequest(c *middleware.Context) {
+ proxyPath := c.Params("*")
+ proxy := ReverseProxyGnetReq(proxyPath)
+ proxy.Transport = gNetProxyTransport
+ proxy.ServeHTTP(c.Resp, c.Req.Request)
+ c.Resp.Header().Del("Set-Cookie")
+}
diff --git a/pkg/api/index.go b/pkg/api/index.go
index a376f9504a4..715baefae78 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -1,7 +1,11 @@
package api
import (
+ "fmt"
+ "strings"
+
"github.com/grafana/grafana/pkg/api/dtos"
+ "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins"
@@ -14,6 +18,31 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
return nil, err
}
+ prefsQuery := m.GetPreferencesWithDefaultsQuery{OrgId: c.OrgId, UserId: c.UserId}
+ if err := bus.Dispatch(&prefsQuery); err != nil {
+ return nil, err
+ }
+ prefs := prefsQuery.Result
+
+ // Read locale from acccept-language
+ acceptLang := c.Req.Header.Get("Accept-Language")
+ locale := "en-US"
+
+ if len(acceptLang) > 0 {
+ parts := strings.Split(acceptLang, ",")
+ locale = parts[0]
+ }
+
+ appUrl := setting.AppUrl
+ appSubUrl := setting.AppSubUrl
+
+ // special case when doing localhost call from phantomjs
+ if c.IsRenderCall {
+ appUrl = fmt.Sprintf("%s://localhost:%s", setting.Protocol, setting.HttpPort)
+ appSubUrl = ""
+ settings["appSubUrl"] = ""
+ }
+
var data = dtos.IndexViewData{
User: &dtos.CurrentUser{
Id: c.UserId,
@@ -21,18 +50,25 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
Login: c.Login,
Email: c.Email,
Name: c.Name,
- LightTheme: c.Theme == "light",
OrgId: c.OrgId,
OrgName: c.OrgName,
OrgRole: c.OrgRole,
GravatarUrl: dtos.GetGravatarUrl(c.Email),
IsGrafanaAdmin: c.IsGrafanaAdmin,
+ LightTheme: prefs.Theme == "light",
+ Timezone: prefs.Timezone,
+ Locale: locale,
+ HelpFlags1: c.HelpFlags1,
},
- Settings: settings,
- AppUrl: setting.AppUrl,
- AppSubUrl: setting.AppSubUrl,
- GoogleAnalyticsId: setting.GoogleAnalyticsId,
- GoogleTagManagerId: setting.GoogleTagManagerId,
+ Settings: settings,
+ AppUrl: appUrl,
+ AppSubUrl: appSubUrl,
+ GoogleAnalyticsId: setting.GoogleAnalyticsId,
+ GoogleTagManagerId: setting.GoogleTagManagerId,
+ BuildVersion: setting.BuildVersion,
+ BuildCommit: setting.BuildCommit,
+ NewGrafanaVersion: plugins.GrafanaLatestVersion,
+ NewGrafanaVersionExists: plugins.GrafanaHasUpdate,
}
if setting.DisableGravatar {
@@ -57,7 +93,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
if c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR {
dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Divider: true})
dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Text: "New", Icon: "fa fa-plus", Url: setting.AppSubUrl + "/dashboard/new"})
- dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Text: "Import", Icon: "fa fa-download", Url: setting.AppSubUrl + "/import/dashboard"})
+ dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Text: "Import", Icon: "fa fa-download", Url: setting.AppSubUrl + "/dashboard/new/?editview=import"})
}
data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{
@@ -67,6 +103,20 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
Children: dashboardChildNavs,
})
+ if c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR {
+ alertChildNavs := []*dtos.NavLink{
+ {Text: "Alert List", Url: setting.AppSubUrl + "/alerting/list"},
+ {Text: "Notification channels", Url: setting.AppSubUrl + "/alerting/notifications"},
+ }
+
+ data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{
+ Text: "Alerting",
+ Icon: "icon-gf icon-gf-alert",
+ Url: setting.AppSubUrl + "/alerting/list",
+ Children: alertChildNavs,
+ })
+ }
+
if c.OrgRole == m.ROLE_ADMIN {
data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{
Text: "Data Sources",
@@ -95,6 +145,10 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
}
for _, include := range plugin.Includes {
+ if !c.HasUserRole(include.Role) {
+ continue
+ }
+
if include.Type == "page" && include.AddToNav {
link := &dtos.NavLink{
Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/page/" + include.Slug,
@@ -102,6 +156,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
}
appLink.Children = append(appLink.Children, link)
}
+
if include.Type == "dashboard" && include.AddToNav {
link := &dtos.NavLink{
Url: setting.AppSubUrl + "/dashboard/db/" + include.Slug,
@@ -111,12 +166,14 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
}
}
- if c.OrgRole == m.ROLE_ADMIN {
+ if len(appLink.Children) > 0 && c.OrgRole == m.ROLE_ADMIN {
appLink.Children = append(appLink.Children, &dtos.NavLink{Divider: true})
appLink.Children = append(appLink.Children, &dtos.NavLink{Text: "Plugin Config", Icon: "fa fa-cog", Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/edit"})
}
- data.MainNavLinks = append(data.MainNavLinks, appLink)
+ if len(appLink.Children) > 0 {
+ data.MainNavLinks = append(data.MainNavLinks, appLink)
+ }
}
}
diff --git a/pkg/api/login.go b/pkg/api/login.go
index 463fa8282a5..8fbe414c08c 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -25,10 +25,15 @@ func LoginView(c *middleware.Context) {
return
}
- viewData.Settings["googleAuthEnabled"] = setting.OAuthService.Google
- viewData.Settings["githubAuthEnabled"] = setting.OAuthService.GitHub
+ enabledOAuths := make(map[string]interface{})
+ for key, oauth := range setting.OAuthService.OAuthInfos {
+ enabledOAuths[key] = map[string]string{"name": oauth.Name}
+ }
+
+ viewData.Settings["oauth"] = enabledOAuths
viewData.Settings["disableUserSignUp"] = !setting.AllowUserSignUp
viewData.Settings["loginHint"] = setting.LoginHint
+ viewData.Settings["disableLoginForm"] = setting.DisableLoginForm
if !tryLoginUsingRememberCookie(c) {
c.HTML(200, VIEW_INDEX, viewData)
diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index 4244feef664..574d08af09f 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -1,14 +1,20 @@
package api
import (
+ "crypto/rand"
+ "crypto/tls"
+ "crypto/x509"
+ "encoding/base64"
"errors"
"fmt"
- "net/url"
+ "io/ioutil"
+ "log"
+ "net/http"
+ "golang.org/x/net/context"
"golang.org/x/oauth2"
"github.com/grafana/grafana/pkg/bus"
- "github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
@@ -16,6 +22,12 @@ import (
"github.com/grafana/grafana/pkg/social"
)
+func GenStateString() string {
+ rnd := make([]byte, 32)
+ rand.Read(rnd)
+ return base64.StdEncoding.EncodeToString(rnd)
+}
+
func OAuthLogin(ctx *middleware.Context) {
if setting.OAuthService == nil {
ctx.Handle(404, "login.OAuthLogin(oauth service not enabled)", nil)
@@ -29,43 +41,102 @@ func OAuthLogin(ctx *middleware.Context) {
return
}
+ error := ctx.Query("error")
+ if error != "" {
+ errorDesc := ctx.Query("error_description")
+ ctx.Logger.Info("OAuthLogin Failed", "error", error, "errorDesc", errorDesc)
+ ctx.Redirect(setting.AppSubUrl + "/login?failCode=1003")
+ return
+ }
+
code := ctx.Query("code")
if code == "" {
- ctx.Redirect(connect.AuthCodeURL("", oauth2.AccessTypeOnline))
+ state := GenStateString()
+ ctx.Session.Set(middleware.SESS_KEY_OAUTH_STATE, state)
+ if setting.OAuthService.OAuthInfos[name].HostedDomain == "" {
+ ctx.Redirect(connect.AuthCodeURL(state, oauth2.AccessTypeOnline))
+ } else {
+ ctx.Redirect(connect.AuthCodeURL(state, oauth2.SetParam("hd", setting.OAuthService.OAuthInfos[name].HostedDomain), oauth2.AccessTypeOnline))
+ }
+ return
+ }
+
+ // verify state string
+ savedState := ctx.Session.Get(middleware.SESS_KEY_OAUTH_STATE).(string)
+ queryState := ctx.Query("state")
+ if savedState != queryState {
+ ctx.Handle(500, "login.OAuthLogin(state mismatch)", nil)
return
}
// handle call back
- token, err := connect.Exchange(oauth2.NoContext, code)
+
+ // initialize oauth2 context
+ oauthCtx := oauth2.NoContext
+ if setting.OAuthService.OAuthInfos[name].TlsClientCert != "" {
+ cert, err := tls.LoadX509KeyPair(setting.OAuthService.OAuthInfos[name].TlsClientCert, setting.OAuthService.OAuthInfos[name].TlsClientKey)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ // Load CA cert
+ caCert, err := ioutil.ReadFile(setting.OAuthService.OAuthInfos[name].TlsClientCa)
+ if err != nil {
+ log.Fatal(err)
+ }
+ caCertPool := x509.NewCertPool()
+ caCertPool.AppendCertsFromPEM(caCert)
+
+ tr := &http.Transport{
+ TLSClientConfig: &tls.Config{
+ InsecureSkipVerify: true,
+ Certificates: []tls.Certificate{cert},
+ RootCAs: caCertPool,
+ },
+ }
+ sslcli := &http.Client{Transport: tr}
+
+ oauthCtx = context.Background()
+ oauthCtx = context.WithValue(oauthCtx, oauth2.HTTPClient, sslcli)
+ }
+
+ // get token from provider
+ token, err := connect.Exchange(oauthCtx, code)
if err != nil {
ctx.Handle(500, "login.OAuthLogin(NewTransportWithCode)", err)
return
}
+ // token.TokenType was defaulting to "bearer", which is out of spec, so we explicitly set to "Bearer"
+ token.TokenType = "Bearer"
- log.Trace("login.OAuthLogin(Got token)")
+ ctx.Logger.Debug("OAuthLogin Got token")
- userInfo, err := connect.UserInfo(token)
+ // set up oauth2 client
+ client := connect.Client(oauthCtx, token)
+
+ // get user info
+ userInfo, err := connect.UserInfo(client)
if err != nil {
if err == social.ErrMissingTeamMembership {
- ctx.Redirect(setting.AppSubUrl + "/login?failedMsg=" + url.QueryEscape("Required Github team membership not fulfilled"))
+ ctx.Redirect(setting.AppSubUrl + "/login?failCode=1000")
} else if err == social.ErrMissingOrganizationMembership {
- ctx.Redirect(setting.AppSubUrl + "/login?failedMsg=" + url.QueryEscape("Required Github organization membership not fulfilled"))
+ ctx.Redirect(setting.AppSubUrl + "/login?failCode=1001")
} else {
ctx.Handle(500, fmt.Sprintf("login.OAuthLogin(get info from %s)", name), err)
}
return
}
- log.Trace("login.OAuthLogin(social login): %s", userInfo)
+ ctx.Logger.Debug("OAuthLogin got user info", "userInfo", userInfo)
// validate that the email is allowed to login to grafana
if !connect.IsEmailAllowed(userInfo.Email) {
- log.Info("OAuth login attempt with unallowed email, %s", userInfo.Email)
- ctx.Redirect(setting.AppSubUrl + "/login?failedMsg=" + url.QueryEscape("Required email domain not fulfilled"))
+ ctx.Logger.Info("OAuth login attempt with unallowed email", "email", userInfo.Email)
+ ctx.Redirect(setting.AppSubUrl + "/login?failCode=1002")
return
}
- userQuery := m.GetUserByLoginQuery{LoginOrEmail: userInfo.Email}
+ userQuery := m.GetUserByEmailQuery{Email: userInfo.Email}
err = bus.Dispatch(&userQuery)
// create account if missing
@@ -84,10 +155,11 @@ func OAuthLogin(ctx *middleware.Context) {
return
}
cmd := m.CreateUserCommand{
- Login: userInfo.Email,
- Email: userInfo.Email,
- Name: userInfo.Name,
- Company: userInfo.Company,
+ Login: userInfo.Login,
+ Email: userInfo.Email,
+ Name: userInfo.Name,
+ Company: userInfo.Company,
+ DefaultOrgRole: userInfo.Role,
}
if err = bus.Dispatch(&cmd); err != nil {
diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go
index 6d9165cd6ab..dad3b159ad6 100644
--- a/pkg/api/metrics.go
+++ b/pkg/api/metrics.go
@@ -1,36 +1,116 @@
package api
import (
+ "context"
+ "encoding/json"
+ "net/http"
+
"github.com/grafana/grafana/pkg/api/dtos"
+ "github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"
- "math/rand"
- "strconv"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/tsdb"
+ "github.com/grafana/grafana/pkg/tsdb/testdata"
+ "github.com/grafana/grafana/pkg/util"
)
-func GetTestMetrics(c *middleware.Context) {
- from := c.QueryInt64("from")
- to := c.QueryInt64("to")
- maxDataPoints := c.QueryInt64("maxDataPoints")
- stepInSeconds := (to - from) / maxDataPoints
+// POST /api/tsdb/query
+func QueryMetrics(c *middleware.Context, reqDto dtos.MetricRequest) Response {
+ timeRange := tsdb.NewTimeRange(reqDto.From, reqDto.To)
- result := dtos.MetricQueryResultDto{}
- result.Data = make([]dtos.MetricQueryResultDataDto, 1)
+ request := &tsdb.Request{TimeRange: timeRange}
- for seriesIndex := range result.Data {
- points := make([][2]float64, maxDataPoints)
- walker := rand.Float64() * 100
- time := from
-
- for i := range points {
- points[i][0] = walker
- points[i][1] = float64(time)
- walker += rand.Float64() - 0.5
- time += stepInSeconds
- }
-
- result.Data[seriesIndex].Target = "test-series-" + strconv.Itoa(seriesIndex)
- result.Data[seriesIndex].DataPoints = points
+ for _, query := range reqDto.Queries {
+ request.Queries = append(request.Queries, &tsdb.Query{
+ RefId: query.Get("refId").MustString("A"),
+ MaxDataPoints: query.Get("maxDataPoints").MustInt64(100),
+ IntervalMs: query.Get("intervalMs").MustInt64(1000),
+ Model: query,
+ DataSource: &models.DataSource{
+ Name: "Grafana TestDataDB",
+ Type: "grafana-testdata-datasource",
+ },
+ })
}
- c.JSON(200, &result)
+ resp, err := tsdb.HandleRequest(context.TODO(), request)
+ if err != nil {
+ return ApiError(500, "Metric request error", err)
+ }
+
+ return Json(200, &resp)
+}
+
+// GET /api/tsdb/testdata/scenarios
+func GetTestDataScenarios(c *middleware.Context) Response {
+ result := make([]interface{}, 0)
+
+ for _, scenario := range testdata.ScenarioRegistry {
+ result = append(result, map[string]interface{}{
+ "id": scenario.Id,
+ "name": scenario.Name,
+ "description": scenario.Description,
+ "stringInput": scenario.StringInput,
+ })
+ }
+
+ return Json(200, &result)
+}
+
+func GetInternalMetrics(c *middleware.Context) Response {
+ if metrics.UseNilMetrics {
+ return Json(200, util.DynMap{"message": "Metrics disabled"})
+ }
+
+ snapshots := metrics.MetricStats.GetSnapshots()
+
+ resp := make(map[string]interface{})
+
+ for _, m := range snapshots {
+ metricName := m.Name() + m.StringifyTags()
+
+ switch metric := m.(type) {
+ case metrics.Gauge:
+ resp[metricName] = map[string]interface{}{
+ "value": metric.Value(),
+ }
+ case metrics.Counter:
+ resp[metricName] = map[string]interface{}{
+ "count": metric.Count(),
+ }
+ case metrics.Timer:
+ percentiles := metric.Percentiles([]float64{0.25, 0.75, 0.90, 0.99})
+ resp[metricName] = map[string]interface{}{
+ "count": metric.Count(),
+ "min": metric.Min(),
+ "max": metric.Max(),
+ "mean": metric.Mean(),
+ "std": metric.StdDev(),
+ "p25": percentiles[0],
+ "p75": percentiles[1],
+ "p90": percentiles[2],
+ "p99": percentiles[3],
+ }
+ }
+ }
+
+ var b []byte
+ var err error
+ if b, err = json.MarshalIndent(resp, "", " "); err != nil {
+ return ApiError(500, "body json marshal", err)
+ }
+
+ return &NormalResponse{
+ body: b,
+ status: 200,
+ header: http.Header{
+ "Content-Type": []string{"application/json"},
+ },
+ }
+}
+
+// Genereates a index out of range error
+func GenerateError(c *middleware.Context) Response {
+ var array []string
+ return Json(200, array[20])
}
diff --git a/pkg/api/org.go b/pkg/api/org.go
index 61af62311c6..26b2cf92fd8 100644
--- a/pkg/api/org.go
+++ b/pkg/api/org.go
@@ -152,6 +152,9 @@ func updateOrgAddressHelper(form dtos.UpdateOrgAddressForm, orgId int64) Respons
// GET /api/orgs/:orgId
func DeleteOrgById(c *middleware.Context) Response {
if err := bus.Dispatch(&m.DeleteOrgCommand{Id: c.ParamsInt64(":orgId")}); err != nil {
+ if err == m.ErrOrgNotFound {
+ return ApiError(404, "Failed to delete organization. ID not found", nil)
+ }
return ApiError(500, "Failed to update organization", err)
}
return ApiSuccess("Organization deleted")
diff --git a/pkg/api/org_users.go b/pkg/api/org_users.go
index 03570619e6b..02c376eed30 100644
--- a/pkg/api/org_users.go
+++ b/pkg/api/org_users.go
@@ -38,6 +38,9 @@ func addOrgUserHelper(cmd m.AddOrgUserCommand) Response {
cmd.UserId = userToAdd.Id
if err := bus.Dispatch(&cmd); err != nil {
+ if err == m.ErrOrgUserAlreadyAdded {
+ return ApiError(409, "User is already member of this organization", nil)
+ }
return ApiError(500, "Could not add user to organization", err)
}
diff --git a/pkg/api/playlist.go b/pkg/api/playlist.go
index 7aa3c7d0057..a6c2da26dd8 100644
--- a/pkg/api/playlist.go
+++ b/pkg/api/playlist.go
@@ -26,6 +26,18 @@ func ValidateOrgPlaylist(c *middleware.Context) {
c.JsonApiErr(403, "You are not allowed to edit/view playlist", nil)
return
}
+
+ items, itemsErr := LoadPlaylistItemDTOs(id)
+
+ if itemsErr != nil {
+ c.JsonApiErr(404, "Playlist items not found", err)
+ return
+ }
+
+ if len(items) == 0 {
+ c.JsonApiErr(404, "Playlist is empty", itemsErr)
+ return
+ }
}
func SearchPlaylists(c *middleware.Context) Response {
diff --git a/pkg/api/playlist_play.go b/pkg/api/playlist_play.go
index f3bae6cbcd3..780767531a8 100644
--- a/pkg/api/playlist_play.go
+++ b/pkg/api/playlist_play.go
@@ -1,16 +1,18 @@
package api
import (
+ "sort"
"strconv"
+ "github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
_ "github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/search"
)
-func populateDashboardsById(dashboardByIds []int64) ([]m.PlaylistDashboardDto, error) {
- result := make([]m.PlaylistDashboardDto, 0)
+func populateDashboardsById(dashboardByIds []int64, dashboardIdOrder map[int64]int) (dtos.PlaylistDashboardsSlice, error) {
+ result := make(dtos.PlaylistDashboardsSlice, 0)
if len(dashboardByIds) > 0 {
dashboardQuery := m.GetDashboardsQuery{DashboardIds: dashboardByIds}
@@ -18,12 +20,13 @@ func populateDashboardsById(dashboardByIds []int64) ([]m.PlaylistDashboardDto, e
return result, err
}
- for _, item := range *dashboardQuery.Result {
- result = append(result, m.PlaylistDashboardDto{
+ for _, item := range dashboardQuery.Result {
+ result = append(result, dtos.PlaylistDashboard{
Id: item.Id,
Slug: item.Slug,
Title: item.Title,
Uri: "db/" + item.Slug,
+ Order: dashboardIdOrder[item.Id],
})
}
}
@@ -31,8 +34,8 @@ func populateDashboardsById(dashboardByIds []int64) ([]m.PlaylistDashboardDto, e
return result, nil
}
-func populateDashboardsByTag(orgId, userId int64, dashboardByTag []string) []m.PlaylistDashboardDto {
- result := make([]m.PlaylistDashboardDto, 0)
+func populateDashboardsByTag(orgId, userId int64, dashboardByTag []string, dashboardTagOrder map[string]int) dtos.PlaylistDashboardsSlice {
+ result := make(dtos.PlaylistDashboardsSlice, 0)
if len(dashboardByTag) > 0 {
for _, tag := range dashboardByTag {
@@ -47,10 +50,11 @@ func populateDashboardsByTag(orgId, userId int64, dashboardByTag []string) []m.P
if err := bus.Dispatch(&searchQuery); err == nil {
for _, item := range searchQuery.Result {
- result = append(result, m.PlaylistDashboardDto{
+ result = append(result, dtos.PlaylistDashboard{
Id: item.Id,
Title: item.Title,
Uri: item.Uri,
+ Order: dashboardTagOrder[tag],
})
}
}
@@ -60,28 +64,33 @@ func populateDashboardsByTag(orgId, userId int64, dashboardByTag []string) []m.P
return result
}
-func LoadPlaylistDashboards(orgId, userId, playlistId int64) ([]m.PlaylistDashboardDto, error) {
+func LoadPlaylistDashboards(orgId, userId, playlistId int64) (dtos.PlaylistDashboardsSlice, error) {
playlistItems, _ := LoadPlaylistItems(playlistId)
dashboardByIds := make([]int64, 0)
dashboardByTag := make([]string, 0)
+ dashboardIdOrder := make(map[int64]int)
+ dashboardTagOrder := make(map[string]int)
for _, i := range playlistItems {
if i.Type == "dashboard_by_id" {
dashboardId, _ := strconv.ParseInt(i.Value, 10, 64)
dashboardByIds = append(dashboardByIds, dashboardId)
+ dashboardIdOrder[dashboardId] = i.Order
}
if i.Type == "dashboard_by_tag" {
dashboardByTag = append(dashboardByTag, i.Value)
+ dashboardTagOrder[i.Value] = i.Order
}
}
- result := make([]m.PlaylistDashboardDto, 0)
+ result := make(dtos.PlaylistDashboardsSlice, 0)
- var k, _ = populateDashboardsById(dashboardByIds)
+ var k, _ = populateDashboardsById(dashboardByIds, dashboardIdOrder)
result = append(result, k...)
- result = append(result, populateDashboardsByTag(orgId, userId, dashboardByTag)...)
+ result = append(result, populateDashboardsByTag(orgId, userId, dashboardByTag, dashboardTagOrder)...)
+ sort.Sort(sort.Reverse(result))
return result, nil
}
diff --git a/pkg/api/pluginproxy/pluginproxy.go b/pkg/api/pluginproxy/pluginproxy.go
index 92d07988b64..21d40ecb948 100644
--- a/pkg/api/pluginproxy/pluginproxy.go
+++ b/pkg/api/pluginproxy/pluginproxy.go
@@ -88,7 +88,7 @@ func NewApiPluginProxy(ctx *middleware.Context, proxyPath string, route *plugins
}
for key, value := range headers {
- log.Info("setting key %v value %v", key, value[0])
+ log.Trace("setting key %v value %v", key, value[0])
req.Header.Set(key, value[0])
}
}
diff --git a/pkg/api/plugins.go b/pkg/api/plugins.go
index 0411c0746ef..9d25b9c331e 100644
--- a/pkg/api/plugins.go
+++ b/pkg/api/plugins.go
@@ -8,12 +8,14 @@ import (
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins"
+ "github.com/grafana/grafana/pkg/setting"
)
func GetPluginList(c *middleware.Context) Response {
typeFilter := c.Query("type")
enabledFilter := c.Query("enabled")
embeddedFilter := c.Query("embedded")
+ coreFilter := c.Query("core")
pluginSettingsMap, err := plugins.GetPluginSettings(c.OrgId)
@@ -28,16 +30,24 @@ func GetPluginList(c *middleware.Context) Response {
continue
}
+ // filter out core plugins
+ if coreFilter == "0" && pluginDef.IsCorePlugin {
+ continue
+ }
+
// filter on type
if typeFilter != "" && typeFilter != pluginDef.Type {
continue
}
listItem := dtos.PluginListItem{
- Id: pluginDef.Id,
- Name: pluginDef.Name,
- Type: pluginDef.Type,
- Info: &pluginDef.Info,
+ Id: pluginDef.Id,
+ Name: pluginDef.Name,
+ Type: pluginDef.Type,
+ Info: &pluginDef.Info,
+ LatestVersion: pluginDef.GrafanaNetVersion,
+ HasUpdate: pluginDef.GrafanaNetHasUpdate,
+ DefaultNavUrl: pluginDef.DefaultNavUrl,
}
if pluginSetting, exists := pluginSettingsMap[pluginDef.Id]; exists {
@@ -45,6 +55,10 @@ func GetPluginList(c *middleware.Context) Response {
listItem.Pinned = pluginSetting.Pinned
}
+ if listItem.DefaultNavUrl == "" || !listItem.Enabled {
+ listItem.DefaultNavUrl = setting.AppSubUrl + "/plugins/" + listItem.Id + "/edit"
+ }
+
// filter out disabled
if enabledFilter == "1" && !listItem.Enabled {
continue
@@ -81,6 +95,8 @@ func GetPluginSettingById(c *middleware.Context) Response {
BaseUrl: def.BaseUrl,
Module: def.Module,
DefaultNavUrl: def.DefaultNavUrl,
+ LatestVersion: def.GrafanaNetVersion,
+ HasUpdate: def.GrafanaNetHasUpdate,
}
query := m.GetPluginSettingByIdQuery{PluginId: pluginId, OrgId: c.OrgId}
@@ -146,15 +162,17 @@ func GetPluginReadme(c *middleware.Context) Response {
func ImportDashboard(c *middleware.Context, apiCmd dtos.ImportDashboardCommand) Response {
cmd := plugins.ImportDashboardCommand{
- OrgId: c.OrgId,
- UserId: c.UserId,
- PluginId: apiCmd.PluginId,
- Path: apiCmd.Path,
- Inputs: apiCmd.Inputs,
+ OrgId: c.OrgId,
+ UserId: c.UserId,
+ PluginId: apiCmd.PluginId,
+ Path: apiCmd.Path,
+ Inputs: apiCmd.Inputs,
+ Overwrite: apiCmd.Overwrite,
+ Dashboard: apiCmd.Dashboard,
}
if err := bus.Dispatch(&cmd); err != nil {
- return ApiError(500, "Failed to install dashboard", err)
+ return ApiError(500, "Failed to import dashboard", err)
}
return Json(200, cmd.Result)
diff --git a/pkg/api/preferences.go b/pkg/api/preferences.go
new file mode 100644
index 00000000000..795b8994470
--- /dev/null
+++ b/pkg/api/preferences.go
@@ -0,0 +1,73 @@
+package api
+
+import (
+ "github.com/grafana/grafana/pkg/api/dtos"
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/middleware"
+ m "github.com/grafana/grafana/pkg/models"
+)
+
+// POST /api/preferences/set-home-dash
+func SetHomeDashboard(c *middleware.Context, cmd m.SavePreferencesCommand) Response {
+
+ cmd.UserId = c.UserId
+ cmd.OrgId = c.OrgId
+
+ if err := bus.Dispatch(&cmd); err != nil {
+ return ApiError(500, "Failed to set home dashboard", err)
+ }
+
+ return ApiSuccess("Home dashboard set")
+}
+
+// GET /api/user/preferences
+func GetUserPreferences(c *middleware.Context) Response {
+ return getPreferencesFor(c.OrgId, c.UserId)
+}
+
+func getPreferencesFor(orgId int64, userId int64) Response {
+ prefsQuery := m.GetPreferencesQuery{UserId: userId, OrgId: orgId}
+
+ if err := bus.Dispatch(&prefsQuery); err != nil {
+ return ApiError(500, "Failed to get preferences", err)
+ }
+
+ dto := dtos.Prefs{
+ Theme: prefsQuery.Result.Theme,
+ HomeDashboardId: prefsQuery.Result.HomeDashboardId,
+ Timezone: prefsQuery.Result.Timezone,
+ }
+
+ return Json(200, &dto)
+}
+
+// PUT /api/user/preferences
+func UpdateUserPreferences(c *middleware.Context, dtoCmd dtos.UpdatePrefsCmd) Response {
+ return updatePreferencesFor(c.OrgId, c.UserId, &dtoCmd)
+}
+
+func updatePreferencesFor(orgId int64, userId int64, dtoCmd *dtos.UpdatePrefsCmd) Response {
+ saveCmd := m.SavePreferencesCommand{
+ UserId: userId,
+ OrgId: orgId,
+ Theme: dtoCmd.Theme,
+ Timezone: dtoCmd.Timezone,
+ HomeDashboardId: dtoCmd.HomeDashboardId,
+ }
+
+ if err := bus.Dispatch(&saveCmd); err != nil {
+ return ApiError(500, "Failed to save preferences", err)
+ }
+
+ return ApiSuccess("Preferences updated")
+}
+
+// GET /api/org/preferences
+func GetOrgPreferences(c *middleware.Context) Response {
+ return getPreferencesFor(c.OrgId, 0)
+}
+
+// PUT /api/org/preferences
+func UpdateOrgPreferences(c *middleware.Context, dtoCmd dtos.UpdatePrefsCmd) Response {
+ return updatePreferencesFor(c.OrgId, 0, &dtoCmd)
+}
diff --git a/pkg/api/render.go b/pkg/api/render.go
index 9ed0c5ee6d7..6018656badb 100644
--- a/pkg/api/render.go
+++ b/pkg/api/render.go
@@ -6,35 +6,21 @@ import (
"github.com/grafana/grafana/pkg/components/renderer"
"github.com/grafana/grafana/pkg/middleware"
- "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
)
func RenderToPng(c *middleware.Context) {
queryReader := util.NewUrlQueryReader(c.Req.URL)
queryParams := fmt.Sprintf("?%s", c.Req.URL.RawQuery)
- sessionId := c.Session.ID()
-
- // Handle api calls authenticated without session
- if sessionId == "" && c.ApiKeyId != 0 {
- c.Session.Start(c)
- c.Session.Set(middleware.SESS_KEY_APIKEY, c.ApiKeyId)
- // release will make sure the new session is persisted before
- // we spin up phantomjs
- c.Session.Release()
- // cleanup session after render is complete
- defer func() { c.Session.Destory(c) }()
- }
renderOpts := &renderer.RenderOpts{
- Url: c.Params("*") + queryParams,
- Width: queryReader.Get("width", "800"),
- Height: queryReader.Get("height", "400"),
- SessionId: c.Session.ID(),
- Timeout: queryReader.Get("timeout", "15"),
+ Path: c.Params("*") + queryParams,
+ Width: queryReader.Get("width", "800"),
+ Height: queryReader.Get("height", "400"),
+ OrgId: c.OrgId,
+ Timeout: queryReader.Get("timeout", "30"),
}
- renderOpts.Url = setting.ToAbsUrl(renderOpts.Url)
pngPath, err := renderer.RenderToPng(renderOpts)
if err != nil {
diff --git a/pkg/api/search.go b/pkg/api/search.go
index 5ec95971033..c68dc51e986 100644
--- a/pkg/api/search.go
+++ b/pkg/api/search.go
@@ -4,6 +4,7 @@ import (
"strconv"
"github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/services/search"
)
@@ -42,5 +43,6 @@ func Search(c *middleware.Context) {
return
}
+ c.TimeRequest(metrics.M_Api_Dashboard_Search)
c.JSON(200, searchQuery.Result)
}
diff --git a/pkg/api/user.go b/pkg/api/user.go
index 5af243eeb22..a22ad028288 100644
--- a/pkg/api/user.go
+++ b/pkg/api/user.go
@@ -4,6 +4,7 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
)
@@ -29,6 +30,14 @@ func getUserUserProfile(userId int64) Response {
// POST /api/user
func UpdateSignedInUser(c *middleware.Context, cmd m.UpdateUserCommand) Response {
+ if setting.AuthProxyEnabled {
+ if setting.AuthProxyHeaderProperty == "email" && cmd.Email != c.Email {
+ return ApiError(400, "Not allowed to change email when auth proxy is using email property", nil)
+ }
+ if setting.AuthProxyHeaderProperty == "username" && cmd.Login != c.Login {
+ return ApiError(400, "Not allowed to change username when auth proxy is using username property", nil)
+ }
+ }
cmd.UserId = c.UserId
return handleUpdateUser(cmd)
}
@@ -39,6 +48,24 @@ func UpdateUser(c *middleware.Context, cmd m.UpdateUserCommand) Response {
return handleUpdateUser(cmd)
}
+//POST /api/users/:id/using/:orgId
+func UpdateUserActiveOrg(c *middleware.Context) Response {
+ userId := c.ParamsInt64(":id")
+ orgId := c.ParamsInt64(":orgId")
+
+ if !validateUsingOrg(userId, orgId) {
+ return ApiError(401, "Not a valid organization", nil)
+ }
+
+ cmd := m.SetUsingOrgCommand{UserId: userId, OrgId: orgId}
+
+ if err := bus.Dispatch(&cmd); err != nil {
+ return ApiError(500, "Failed change active organization", err)
+ }
+
+ return ApiSuccess("Active organization changed")
+}
+
func handleUpdateUser(cmd m.UpdateUserCommand) Response {
if len(cmd.Login) == 0 {
cmd.Login = cmd.Email
@@ -109,7 +136,28 @@ func UserSetUsingOrg(c *middleware.Context) Response {
return ApiSuccess("Active organization changed")
}
+// GET /profile/switch-org/:id
+func ChangeActiveOrgAndRedirectToHome(c *middleware.Context) {
+ orgId := c.ParamsInt64(":id")
+
+ if !validateUsingOrg(c.UserId, orgId) {
+ NotFoundHandler(c)
+ }
+
+ cmd := m.SetUsingOrgCommand{UserId: c.UserId, OrgId: orgId}
+
+ if err := bus.Dispatch(&cmd); err != nil {
+ NotFoundHandler(c)
+ }
+
+ c.Redirect(setting.AppSubUrl + "/")
+}
+
func ChangeUserPassword(c *middleware.Context, cmd m.ChangeUserPasswordCommand) Response {
+ if setting.LdapEnabled || setting.AuthProxyEnabled {
+ return ApiError(400, "Not allowed to change password when LDAP or Auth Proxy is enabled", nil)
+ }
+
userQuery := m.GetUserByIdQuery{Id: c.UserId}
if err := bus.Dispatch(&userQuery); err != nil {
@@ -121,8 +169,9 @@ func ChangeUserPassword(c *middleware.Context, cmd m.ChangeUserPasswordCommand)
return ApiError(401, "Invalid old password", nil)
}
- if len(cmd.NewPassword) < 4 {
- return ApiError(400, "New password too short", nil)
+ password := m.Password(cmd.NewPassword)
+ if password.IsWeak() {
+ return ApiError(400, "New password is too short", nil)
}
cmd.UserId = c.UserId
@@ -144,3 +193,34 @@ func SearchUsers(c *middleware.Context) Response {
return Json(200, query.Result)
}
+
+func SetHelpFlag(c *middleware.Context) Response {
+ flag := c.ParamsInt64(":id")
+
+ bitmask := &c.HelpFlags1
+ bitmask.AddFlag(m.HelpFlags1(flag))
+
+ cmd := m.SetUserHelpFlagCommand{
+ UserId: c.UserId,
+ HelpFlags1: *bitmask,
+ }
+
+ if err := bus.Dispatch(&cmd); err != nil {
+ return ApiError(500, "Failed to update help flag", err)
+ }
+
+ return Json(200, &util.DynMap{"message": "Help flag set", "helpFlags1": cmd.HelpFlags1})
+}
+
+func ClearHelpFlags(c *middleware.Context) Response {
+ cmd := m.SetUserHelpFlagCommand{
+ UserId: c.UserId,
+ HelpFlags1: m.HelpFlags1(0),
+ }
+
+ if err := bus.Dispatch(&cmd); err != nil {
+ return ApiError(500, "Failed to update help flag", err)
+ }
+
+ return Json(200, &util.DynMap{"message": "Help flag set", "helpFlags1": cmd.HelpFlags1})
+}
diff --git a/pkg/bus/bus.go b/pkg/bus/bus.go
index 6eb4b741a27..59d4592766e 100644
--- a/pkg/bus/bus.go
+++ b/pkg/bus/bus.go
@@ -1,18 +1,22 @@
package bus
import (
+ "context"
"fmt"
"reflect"
)
type HandlerFunc interface{}
+type CtxHandlerFunc func()
type Msg interface{}
type Bus interface {
Dispatch(msg Msg) error
+ DispatchCtx(ctx context.Context, msg Msg) error
Publish(msg Msg) error
AddHandler(handler HandlerFunc)
+ AddCtxHandler(handler HandlerFunc)
AddEventListener(handler HandlerFunc)
AddWildcardListener(handler HandlerFunc)
}
@@ -34,6 +38,27 @@ func New() Bus {
return bus
}
+func (b *InProcBus) DispatchCtx(ctx context.Context, msg Msg) error {
+ var msgName = reflect.TypeOf(msg).Elem().Name()
+
+ var handler = b.handlers[msgName]
+ if handler == nil {
+ return fmt.Errorf("handler not found for %s", msgName)
+ }
+
+ var params = make([]reflect.Value, 2)
+ params[0] = reflect.ValueOf(ctx)
+ params[1] = reflect.ValueOf(msg)
+
+ ret := reflect.ValueOf(handler).Call(params)
+ err := ret[0].Interface()
+ if err == nil {
+ return nil
+ } else {
+ return err.(error)
+ }
+}
+
func (b *InProcBus) Dispatch(msg Msg) error {
var msgName = reflect.TypeOf(msg).Elem().Name()
@@ -90,6 +115,12 @@ func (b *InProcBus) AddHandler(handler HandlerFunc) {
b.handlers[queryTypeName] = handler
}
+func (b *InProcBus) AddCtxHandler(handler HandlerFunc) {
+ handlerType := reflect.TypeOf(handler)
+ queryTypeName := handlerType.In(1).Elem().Name()
+ b.handlers[queryTypeName] = handler
+}
+
func (b *InProcBus) AddEventListener(handler HandlerFunc) {
handlerType := reflect.TypeOf(handler)
eventName := handlerType.In(0).Elem().Name()
@@ -105,6 +136,11 @@ func AddHandler(implName string, handler HandlerFunc) {
globalBus.AddHandler(handler)
}
+// Package level functions
+func AddCtxHandler(implName string, handler HandlerFunc) {
+ globalBus.AddCtxHandler(handler)
+}
+
// Package level functions
func AddEventListener(handler HandlerFunc) {
globalBus.AddEventListener(handler)
@@ -118,6 +154,10 @@ func Dispatch(msg Msg) error {
return globalBus.Dispatch(msg)
}
+func DispatchCtx(ctx context.Context, msg Msg) error {
+ return globalBus.DispatchCtx(ctx, msg)
+}
+
func Publish(msg Msg) error {
return globalBus.Publish(msg)
}
diff --git a/pkg/cmd/grafana-cli/commands/command_line.go b/pkg/cmd/grafana-cli/commands/command_line.go
index edbdc03d7c2..ce5d04c1bb5 100644
--- a/pkg/cmd/grafana-cli/commands/command_line.go
+++ b/pkg/cmd/grafana-cli/commands/command_line.go
@@ -16,6 +16,9 @@ type CommandLine interface {
GlobalString(name string) string
FlagNames() (names []string)
Generic(name string) interface{}
+
+ PluginDirectory() string
+ RepoDirectory() string
}
type contextCommandLine struct {
@@ -33,3 +36,11 @@ func (c *contextCommandLine) ShowVersion() {
func (c *contextCommandLine) Application() *cli.App {
return c.App
}
+
+func (c *contextCommandLine) PluginDirectory() string {
+ return c.GlobalString("pluginsDir")
+}
+
+func (c *contextCommandLine) RepoDirectory() string {
+ return c.GlobalString("repo")
+}
diff --git a/pkg/cmd/grafana-cli/commands/commands.go b/pkg/cmd/grafana-cli/commands/commands.go
index 55a0e2660ec..8b2ecfcf7f5 100644
--- a/pkg/cmd/grafana-cli/commands/commands.go
+++ b/pkg/cmd/grafana-cli/commands/commands.go
@@ -1,23 +1,56 @@
package commands
import (
- "github.com/codegangsta/cli"
- "github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
+ "flag"
"os"
+
+ "github.com/codegangsta/cli"
+ "github.com/fatih/color"
+ "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
+ "github.com/grafana/grafana/pkg/services/sqlstore"
+ "github.com/grafana/grafana/pkg/setting"
)
-func runCommand(command func(commandLine CommandLine) error) func(context *cli.Context) {
+var configFile = flag.String("config", "", "path to config file")
+var homePath = flag.String("homepath", "", "path to grafana install/home path, defaults to working directory")
+
+func runDbCommand(command func(commandLine CommandLine) error) func(context *cli.Context) {
return func(context *cli.Context) {
+ flag.Parse()
+ setting.NewConfigContext(&setting.CommandLineArgs{
+ Config: *configFile,
+ HomePath: *homePath,
+ Args: flag.Args(),
+ })
+
+ sqlstore.NewEngine()
+
cmd := &contextCommandLine{context}
if err := command(cmd); err != nil {
- log.Error("\nError: ")
- log.Errorf("%s\n\n", err)
+ logger.Errorf("\n%s: ", color.RedString("Error"))
+ logger.Errorf("%s\n\n", err)
cmd.ShowHelp()
os.Exit(1)
} else {
- log.Info("\nRestart grafana after installing plugins . \n\n")
+ logger.Info("\n\n")
+ }
+ }
+}
+
+func runPluginCommand(command func(commandLine CommandLine) error) func(context *cli.Context) {
+ return func(context *cli.Context) {
+
+ cmd := &contextCommandLine{context}
+ if err := command(cmd); err != nil {
+ logger.Errorf("\n%s: ", color.RedString("Error"))
+ logger.Errorf("%s %s\n\n", color.RedString("✗"), err)
+
+ cmd.ShowHelp()
+ os.Exit(1)
+ } else {
+ logger.Info("\nRestart grafana after installing plugins . \n\n")
}
}
}
@@ -25,28 +58,43 @@ func runCommand(command func(commandLine CommandLine) error) func(context *cli.C
var pluginCommands = []cli.Command{
{
Name: "install",
- Usage: "install ",
- Action: runCommand(installCommand),
+ Usage: "install ",
+ Action: runPluginCommand(installCommand),
}, {
Name: "list-remote",
Usage: "list remote available plugins",
- Action: runCommand(listremoteCommand),
+ Action: runPluginCommand(listremoteCommand),
}, {
- Name: "upgrade",
- Usage: "upgrade ",
- Action: runCommand(upgradeCommand),
+ Name: "list-versions",
+ Usage: "list-versions ",
+ Action: runPluginCommand(listversionsCommand),
}, {
- Name: "upgrade-all",
- Usage: "upgrades all your installed plugins",
- Action: runCommand(upgradeAllCommand),
+ Name: "update",
+ Usage: "update ",
+ Aliases: []string{"upgrade"},
+ Action: runPluginCommand(upgradeCommand),
+ }, {
+ Name: "update-all",
+ Aliases: []string{"upgrade-all"},
+ Usage: "update all your installed plugins",
+ Action: runPluginCommand(upgradeAllCommand),
}, {
Name: "ls",
Usage: "list all installed plugins",
- Action: runCommand(lsCommand),
+ Action: runPluginCommand(lsCommand),
}, {
- Name: "remove",
- Usage: "remove ",
- Action: runCommand(removeCommand),
+ Name: "uninstall",
+ Aliases: []string{"remove"},
+ Usage: "uninstall ",
+ Action: runPluginCommand(removeCommand),
+ },
+}
+
+var adminCommands = []cli.Command{
+ {
+ Name: "reset-admin-password",
+ Usage: "reset-admin-password ",
+ Action: runDbCommand(resetPasswordCommand),
},
}
@@ -56,4 +104,9 @@ var Commands = []cli.Command{
Usage: "Manage plugins for grafana",
Subcommands: pluginCommands,
},
+ {
+ Name: "admin",
+ Usage: "Grafana admin commands",
+ Subcommands: adminCommands,
+ },
}
diff --git a/pkg/cmd/grafana-cli/commands/commandstest/fake_commandLine.go b/pkg/cmd/grafana-cli/commands/commandstest/fake_commandLine.go
index 4a070b5a192..8366e0feb15 100644
--- a/pkg/cmd/grafana-cli/commands/commandstest/fake_commandLine.go
+++ b/pkg/cmd/grafana-cli/commands/commandstest/fake_commandLine.go
@@ -93,3 +93,11 @@ func (fcli *FakeCommandLine) Args() cli.Args {
func (fcli *FakeCommandLine) ShowVersion() {
fcli.VersionShown = true
}
+
+func (fcli *FakeCommandLine) RepoDirectory() string {
+ return fcli.GlobalString("repo")
+}
+
+func (fcli *FakeCommandLine) PluginDirectory() string {
+ return fcli.GlobalString("pluginsDir")
+}
diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go
index 0f783d5d3ff..1f391ea10b3 100644
--- a/pkg/cmd/grafana-cli/commands/install_command.go
+++ b/pkg/cmd/grafana-cli/commands/install_command.go
@@ -14,7 +14,7 @@ import (
"strings"
"github.com/fatih/color"
- "github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
+ "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
)
@@ -25,7 +25,7 @@ func validateInput(c CommandLine, pluginFolder string) error {
return errors.New("please specify plugin to install")
}
- pluginsDir := c.GlobalString("pluginsDir")
+ pluginsDir := c.PluginDirectory()
if pluginsDir == "" {
return errors.New("missing pluginsDir flag")
}
@@ -46,7 +46,7 @@ func validateInput(c CommandLine, pluginFolder string) error {
}
func installCommand(c CommandLine) error {
- pluginFolder := c.GlobalString("pluginsDir")
+ pluginFolder := c.PluginDirectory()
if err := validateInput(c, pluginFolder); err != nil {
return err
}
@@ -58,8 +58,8 @@ func installCommand(c CommandLine) error {
}
func InstallPlugin(pluginName, version string, c CommandLine) error {
- plugin, err := s.GetPlugin(pluginName, c.GlobalString("repo"))
- pluginFolder := c.GlobalString("pluginsDir")
+ plugin, err := s.GetPlugin(pluginName, c.RepoDirectory())
+ pluginFolder := c.PluginDirectory()
if err != nil {
return err
}
@@ -78,25 +78,24 @@ func InstallPlugin(pluginName, version string, c CommandLine) error {
pluginName,
version)
- log.Infof("installing %v @ %v\n", plugin.Id, version)
- log.Infof("from url: %v\n", downloadURL)
- log.Infof("into: %v\n", pluginFolder)
- log.Info("\n")
+ logger.Infof("installing %v @ %v\n", plugin.Id, version)
+ logger.Infof("from url: %v\n", downloadURL)
+ logger.Infof("into: %v\n", pluginFolder)
+ logger.Info("\n")
err = downloadFile(plugin.Id, pluginFolder, downloadURL)
if err != nil {
return err
}
- log.Infof("%s Installed %s successfully \n", color.GreenString("✔"), plugin.Id)
+ logger.Infof("%s Installed %s successfully \n", color.GreenString("✔"), plugin.Id)
- /* Enable once we need support for downloading depedencies
res, _ := s.ReadPlugin(pluginFolder, pluginName)
- for _, v := range res.Dependency.Plugins {
+ for _, v := range res.Dependencies.Plugins {
InstallPlugin(v.Id, version, c)
- log.Infof("Installed dependency: %v ✔\n", v.Id)
+ logger.Infof("Installed dependency: %v ✔\n", v.Id)
}
- */
+
return err
}
@@ -120,16 +119,22 @@ func RemoveGitBuildFromName(pluginName, filename string) string {
}
var retryCount = 0
+var permissionsDeniedMessage = "Could not create %s. Permission denied. Make sure you have write access to plugindir"
func downloadFile(pluginName, filePath, url string) (err error) {
defer func() {
if r := recover(); r != nil {
retryCount++
- if retryCount == 1 {
- log.Debug("\nFailed downloading. Will retry once.\n")
- downloadFile(pluginName, filePath, url)
+ if retryCount < 3 {
+ fmt.Println("Failed downloading. Will retry once.")
+ err = downloadFile(pluginName, filePath, url)
} else {
- panic(r)
+ failure := fmt.Sprintf("%v", r)
+ if failure == "runtime error: makeslice: len out of range" {
+ err = fmt.Errorf("Corrupt http response from source. Please try again.\n")
+ } else {
+ panic(r)
+ }
}
}
}()
@@ -153,26 +158,30 @@ func downloadFile(pluginName, filePath, url string) (err error) {
newFile := path.Join(filePath, RemoveGitBuildFromName(pluginName, zf.Name))
if zf.FileInfo().IsDir() {
- os.Mkdir(newFile, 0777)
+ err := os.Mkdir(newFile, 0777)
+ if PermissionsError(err) {
+ return fmt.Errorf(permissionsDeniedMessage, newFile)
+ }
} else {
dst, err := os.Create(newFile)
- if err != nil {
- if strings.Contains(err.Error(), "permission denied") {
- return fmt.Errorf(
- "Could not create file %s. permission deined. Make sure you have write access to plugindir",
- newFile)
- }
+ if PermissionsError(err) {
+ return fmt.Errorf(permissionsDeniedMessage, newFile)
}
- defer dst.Close()
+
src, err := zf.Open()
if err != nil {
- log.Errorf("%v", err)
+ logger.Errorf("Failed to extract file: %v", err)
}
- defer src.Close()
io.Copy(dst, src)
+ dst.Close()
+ src.Close()
}
}
return nil
}
+
+func PermissionsError(err error) bool {
+ return err != nil && strings.Contains(err.Error(), "permission denied")
+}
diff --git a/pkg/cmd/grafana-cli/commands/listremote_command.go b/pkg/cmd/grafana-cli/commands/listremote_command.go
index 0f0c3077ab9..4798369def1 100644
--- a/pkg/cmd/grafana-cli/commands/listremote_command.go
+++ b/pkg/cmd/grafana-cli/commands/listremote_command.go
@@ -1,12 +1,12 @@
package commands
import (
- "github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
+ "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
)
func listremoteCommand(c CommandLine) error {
- plugin, err := s.ListAllPlugins(c.GlobalString("repo"))
+ plugin, err := s.ListAllPlugins(c.RepoDirectory())
if err != nil {
return err
@@ -18,7 +18,7 @@ func listremoteCommand(c CommandLine) error {
pluginVersion = i.Versions[0].Version
}
- log.Infof("id: %v version: %s\n", i.Id, pluginVersion)
+ logger.Infof("id: %v version: %s\n", i.Id, pluginVersion)
}
return nil
diff --git a/pkg/cmd/grafana-cli/commands/listversions_command.go b/pkg/cmd/grafana-cli/commands/listversions_command.go
new file mode 100644
index 00000000000..95c536e94f0
--- /dev/null
+++ b/pkg/cmd/grafana-cli/commands/listversions_command.go
@@ -0,0 +1,36 @@
+package commands
+
+import (
+ "errors"
+
+ "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
+ s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
+)
+
+func validateVersionInput(c CommandLine) error {
+ arg := c.Args().First()
+ if arg == "" {
+ return errors.New("please specify plugin to list versions for")
+ }
+
+ return nil
+}
+
+func listversionsCommand(c CommandLine) error {
+ if err := validateVersionInput(c); err != nil {
+ return err
+ }
+
+ pluginToList := c.Args().First()
+
+ plugin, err := s.GetPlugin(pluginToList, c.GlobalString("repo"))
+ if err != nil {
+ return err
+ }
+
+ for _, i := range plugin.Versions {
+ logger.Infof("%v\n", i.Version)
+ }
+
+ return nil
+}
diff --git a/pkg/cmd/grafana-cli/commands/ls_command.go b/pkg/cmd/grafana-cli/commands/ls_command.go
index 796f6e500d1..7dcecb9d725 100644
--- a/pkg/cmd/grafana-cli/commands/ls_command.go
+++ b/pkg/cmd/grafana-cli/commands/ls_command.go
@@ -5,7 +5,7 @@ import (
"fmt"
"github.com/fatih/color"
- "github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
+ "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
)
@@ -17,7 +17,7 @@ var validateLsCommand = func(pluginDir string) error {
return errors.New("missing path flag")
}
- log.Debug("plugindir: " + pluginDir + "\n")
+ logger.Debug("plugindir: " + pluginDir + "\n")
pluginDirInfo, err := s.IoHelper.Stat(pluginDir)
if err != nil {
@@ -32,7 +32,7 @@ var validateLsCommand = func(pluginDir string) error {
}
func lsCommand(c CommandLine) error {
- pluginDir := c.GlobalString("pluginsDir")
+ pluginDir := c.PluginDirectory()
if err := validateLsCommand(pluginDir); err != nil {
return err
}
@@ -40,11 +40,11 @@ func lsCommand(c CommandLine) error {
plugins := ls_getPlugins(pluginDir)
if len(plugins) > 0 {
- log.Info("installed plugins:\n")
+ logger.Info("installed plugins:\n")
}
for _, plugin := range plugins {
- log.Infof("%s %s %s \n", plugin.Id, color.YellowString("@"), plugin.Info.Version)
+ logger.Infof("%s %s %s \n", plugin.Id, color.YellowString("@"), plugin.Info.Version)
}
return nil
diff --git a/pkg/cmd/grafana-cli/commands/remove_command.go b/pkg/cmd/grafana-cli/commands/remove_command.go
index e0ecbb2b788..d5ed73def05 100644
--- a/pkg/cmd/grafana-cli/commands/remove_command.go
+++ b/pkg/cmd/grafana-cli/commands/remove_command.go
@@ -2,34 +2,31 @@ package commands
import (
"errors"
-
- "github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
+ "fmt"
m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
services "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
+ "strings"
)
var getPluginss func(path string) []m.InstalledPlugin = services.GetLocalPlugins
var removePlugin func(pluginPath, id string) error = services.RemoveInstalledPlugin
func removeCommand(c CommandLine) error {
- pluginPath := c.GlobalString("pluginsDir")
- localPlugins := getPluginss(pluginPath)
-
- log.Info("remove!\n")
+ pluginPath := c.PluginDirectory()
plugin := c.Args().First()
- log.Info("plugin: " + plugin + "\n")
if plugin == "" {
return errors.New("Missing plugin parameter")
}
- log.Infof("plugins : \n%v\n", localPlugins)
+ err := removePlugin(pluginPath, plugin)
- for _, p := range localPlugins {
- if p.Id == c.Args().First() {
- log.Infof("removing plugin %s", p.Id)
- removePlugin(pluginPath, p.Id)
+ if err != nil {
+ if strings.Contains(err.Error(), "no such file or directory") {
+ return fmt.Errorf("Plugin does not exist")
}
+
+ return err
}
return nil
diff --git a/pkg/cmd/grafana-cli/commands/reset_password_command.go b/pkg/cmd/grafana-cli/commands/reset_password_command.go
new file mode 100644
index 00000000000..af2b8b3f89a
--- /dev/null
+++ b/pkg/cmd/grafana-cli/commands/reset_password_command.go
@@ -0,0 +1,44 @@
+package commands
+
+import (
+ "fmt"
+
+ "github.com/fatih/color"
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/util"
+)
+
+const AdminUserId = 1
+
+func resetPasswordCommand(c CommandLine) error {
+ newPassword := c.Args().First()
+
+ password := models.Password(newPassword)
+ if password.IsWeak() {
+ return fmt.Errorf("New password is too short")
+ }
+
+ userQuery := models.GetUserByIdQuery{Id: AdminUserId}
+
+ if err := bus.Dispatch(&userQuery); err != nil {
+ return fmt.Errorf("Could not read user from database. Error: %v", err)
+ }
+
+ passwordHashed := util.EncodePassword(newPassword, userQuery.Result.Salt)
+
+ cmd := models.ChangeUserPasswordCommand{
+ UserId: AdminUserId,
+ NewPassword: passwordHashed,
+ }
+
+ if err := bus.Dispatch(&cmd); err != nil {
+ return fmt.Errorf("Failed to update user password")
+ }
+
+ logger.Infof("\n")
+ logger.Infof("Admin password changed successfully %s", color.GreenString("✔"))
+
+ return nil
+}
diff --git a/pkg/cmd/grafana-cli/commands/upgrade_all_command.go b/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
index e805e8e6f34..636292cce11 100644
--- a/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
+++ b/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
@@ -1,7 +1,7 @@
package commands
import (
- "github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
+ "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
"github.com/hashicorp/go-version"
@@ -28,7 +28,7 @@ func ShouldUpgrade(installed string, remote m.Plugin) bool {
}
func upgradeAllCommand(c CommandLine) error {
- pluginsDir := c.GlobalString("pluginsDir")
+ pluginsDir := c.PluginDirectory()
localPlugins := s.GetLocalPlugins(pluginsDir)
@@ -51,10 +51,18 @@ func upgradeAllCommand(c CommandLine) error {
}
for _, p := range pluginsToUpgrade {
- log.Infof("Upgrading %v \n", p.Id)
+ logger.Infof("Updating %v \n", p.Id)
- s.RemoveInstalledPlugin(pluginsDir, p.Id)
- InstallPlugin(p.Id, "", c)
+ var err error
+ err = s.RemoveInstalledPlugin(pluginsDir, p.Id)
+ if err != nil {
+ return err
+ }
+
+ err = InstallPlugin(p.Id, "", c)
+ if err != nil {
+ return err
+ }
}
return nil
diff --git a/pkg/cmd/grafana-cli/commands/upgrade_command.go b/pkg/cmd/grafana-cli/commands/upgrade_command.go
index b9ca834be6d..355ccab3d1c 100644
--- a/pkg/cmd/grafana-cli/commands/upgrade_command.go
+++ b/pkg/cmd/grafana-cli/commands/upgrade_command.go
@@ -1,11 +1,13 @@
package commands
import (
+ "github.com/fatih/color"
+ "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
)
func upgradeCommand(c CommandLine) error {
- pluginsDir := c.GlobalString("pluginsDir")
+ pluginsDir := c.PluginDirectory()
pluginName := c.Args().First()
localPlugin, err := s.ReadPlugin(pluginsDir, pluginName)
@@ -14,20 +16,17 @@ func upgradeCommand(c CommandLine) error {
return err
}
- remotePlugins, err2 := s.ListAllPlugins(c.GlobalString("repo"))
+ v, err2 := s.GetPlugin(localPlugin.Id, c.RepoDirectory())
if err2 != nil {
return err2
}
- for _, v := range remotePlugins.Plugins {
- if localPlugin.Id == v.Id {
- if ShouldUpgrade(localPlugin.Info.Version, v) {
- s.RemoveInstalledPlugin(pluginsDir, pluginName)
- return InstallPlugin(localPlugin.Id, "", c)
- }
- }
+ if ShouldUpgrade(localPlugin.Info.Version, v) {
+ s.RemoveInstalledPlugin(pluginsDir, pluginName)
+ return InstallPlugin(localPlugin.Id, "", c)
}
+ logger.Infof("%s %s is up to date \n", color.GreenString("✔"), localPlugin.Id)
return nil
}
diff --git a/pkg/cmd/grafana-cli/log/log.go b/pkg/cmd/grafana-cli/logger/logger.go
similarity index 97%
rename from pkg/cmd/grafana-cli/log/log.go
rename to pkg/cmd/grafana-cli/logger/logger.go
index c8222d60c81..de98a6f147b 100644
--- a/pkg/cmd/grafana-cli/log/log.go
+++ b/pkg/cmd/grafana-cli/logger/logger.go
@@ -1,4 +1,4 @@
-package log
+package logger
import (
"fmt"
diff --git a/pkg/cmd/grafana-cli/main.go b/pkg/cmd/grafana-cli/main.go
index b5b13ee36e0..658edd0f895 100644
--- a/pkg/cmd/grafana-cli/main.go
+++ b/pkg/cmd/grafana-cli/main.go
@@ -7,22 +7,17 @@ import (
"github.com/codegangsta/cli"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/commands"
- "github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
+ "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
+ "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
+ "github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
)
var version = "master"
-func getGrafanaPluginDir() string {
- os := runtime.GOOS
- if os == "windows" {
- return "C:\\opt\\grafana\\plugins"
- } else {
- return "/var/lib/grafana/plugins"
- }
-}
-
func main() {
- SetupLogging()
+ setupLogging()
+
+ services.Init(version)
app := cli.NewApp()
app.Name = "Grafana cli"
@@ -34,7 +29,7 @@ func main() {
cli.StringFlag{
Name: "pluginsDir",
Usage: "path to the grafana plugin directory",
- Value: getGrafanaPluginDir(),
+ Value: utils.GetGrafanaPluginDir(runtime.GOOS),
EnvVar: "GF_PLUGIN_DIR",
},
cli.StringFlag{
@@ -53,14 +48,14 @@ func main() {
app.CommandNotFound = cmdNotFound
if err := app.Run(os.Args); err != nil {
- log.Errorf("%v", err)
+ logger.Errorf("%v", err)
}
}
-func SetupLogging() {
+func setupLogging() {
for _, f := range os.Args {
if f == "-D" || f == "--debug" || f == "-debug" {
- log.SetDebug(true)
+ logger.SetDebug(true)
}
}
}
diff --git a/pkg/cmd/grafana-cli/models/model.go b/pkg/cmd/grafana-cli/models/model.go
index 3a39c5fbe65..0700cb9a9e4 100644
--- a/pkg/cmd/grafana-cli/models/model.go
+++ b/pkg/cmd/grafana-cli/models/model.go
@@ -9,11 +9,11 @@ type InstalledPlugin struct {
Name string `json:"name"`
Type string `json:"type"`
- Info PluginInfo `json:"info"`
- Dependency Dependency `json:"dependencies"`
+ Info PluginInfo `json:"info"`
+ Dependencies Dependencies `json:"dependencies"`
}
-type Dependency struct {
+type Dependencies struct {
GrafanaVersion string `json:"grafanaVersion"`
Plugins []Plugin `json:"plugins"`
}
diff --git a/pkg/cmd/grafana-cli/services/services.go b/pkg/cmd/grafana-cli/services/services.go
index f0ad460842d..6c739f8b0ee 100644
--- a/pkg/cmd/grafana-cli/services/services.go
+++ b/pkg/cmd/grafana-cli/services/services.go
@@ -1,50 +1,97 @@
package services
import (
+ "crypto/tls"
"encoding/json"
"errors"
"fmt"
+ "io/ioutil"
+ "net"
+ "net/http"
+ "net/url"
"path"
+ "time"
- "github.com/franela/goreq"
- "github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
+ "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
)
-var IoHelper m.IoUtil = IoUtilImp{}
+var (
+ IoHelper m.IoUtil = IoUtilImp{}
+ HttpClient http.Client
+ grafanaVersion string
+)
+
+func Init(version string) {
+ grafanaVersion = version
+
+ tr := &http.Transport{
+ Proxy: http.ProxyFromEnvironment,
+ DialContext: (&net.Dialer{
+ Timeout: 30 * time.Second,
+ KeepAlive: 30 * time.Second,
+ }).DialContext,
+ MaxIdleConns: 100,
+ IdleConnTimeout: 90 * time.Second,
+ TLSHandshakeTimeout: 10 * time.Second,
+ ExpectContinueTimeout: 1 * time.Second,
+
+ TLSClientConfig: &tls.Config{InsecureSkipVerify: false},
+ }
+
+ HttpClient = http.Client{
+ Timeout: time.Duration(10 * time.Second),
+ Transport: tr,
+ }
+}
func ListAllPlugins(repoUrl string) (m.PluginRepo, error) {
- fullUrl := repoUrl + "/repo"
- res, err := goreq.Request{Uri: fullUrl, MaxRedirects: 3}.Do()
+ body, err := sendRequest(repoUrl, "repo")
+
+ if err != nil {
+ logger.Info("Failed to send request", "error", err)
+ return m.PluginRepo{}, fmt.Errorf("Failed to send request. error: %v", err)
+ }
+
if err != nil {
return m.PluginRepo{}, err
}
- if res.StatusCode != 200 {
- return m.PluginRepo{}, fmt.Errorf("Could not access %s statuscode %v", fullUrl, res.StatusCode)
- }
- var resp m.PluginRepo
- err = res.Body.FromJsonTo(&resp)
+ var data m.PluginRepo
+ err = json.Unmarshal(body, &data)
if err != nil {
- return m.PluginRepo{}, errors.New("Could not load plugin data")
+ logger.Info("Failed to unmarshal graphite response error: %v", err)
+ return m.PluginRepo{}, err
}
- return resp, nil
+ return data, nil
}
func ReadPlugin(pluginDir, pluginName string) (m.InstalledPlugin, error) {
- pluginDataPath := path.Join(pluginDir, pluginName, "plugin.json")
- pluginData, _ := IoHelper.ReadFile(pluginDataPath)
+ distPluginDataPath := path.Join(pluginDir, pluginName, "dist", "plugin.json")
+
+ var data []byte
+ var err error
+ data, err = IoHelper.ReadFile(distPluginDataPath)
+
+ if err != nil {
+ pluginDataPath := path.Join(pluginDir, pluginName, "plugin.json")
+ data, err = IoHelper.ReadFile(pluginDataPath)
+
+ if err != nil {
+ return m.InstalledPlugin{}, errors.New("Could not find dist/plugin.json or plugin.json on " + pluginName + " in " + pluginDir)
+ }
+ }
res := m.InstalledPlugin{}
- json.Unmarshal(pluginData, &res)
+ json.Unmarshal(data, &res)
if res.Info.Version == "" {
res.Info.Version = "0.0.0"
}
if res.Id == "" {
- return m.InstalledPlugin{}, errors.New("could not read find plugin " + pluginName)
+ return m.InstalledPlugin{}, errors.New("could not find plugin " + pluginName + " in " + pluginDir)
}
return res, nil
@@ -63,19 +110,66 @@ func GetLocalPlugins(pluginDir string) []m.InstalledPlugin {
return result
}
-func RemoveInstalledPlugin(pluginPath, id string) error {
- log.Infof("Removing plugin: %v\n", id)
- return IoHelper.RemoveAll(path.Join(pluginPath, id))
+func RemoveInstalledPlugin(pluginPath, pluginName string) error {
+ logger.Infof("Removing plugin: %v\n", pluginName)
+ pluginDir := path.Join(pluginPath, pluginName)
+
+ _, err := IoHelper.Stat(pluginDir)
+ if err != nil {
+ return err
+ }
+
+ return IoHelper.RemoveAll(pluginDir)
}
func GetPlugin(pluginId, repoUrl string) (m.Plugin, error) {
- resp, _ := ListAllPlugins(repoUrl)
+ body, err := sendRequest(repoUrl, "repo", pluginId)
- for _, i := range resp.Plugins {
- if i.Id == pluginId {
- return i, nil
- }
+ if err != nil {
+ logger.Info("Failed to send request", "error", err)
+ return m.Plugin{}, fmt.Errorf("Failed to send request. error: %v", err)
}
- return m.Plugin{}, errors.New("could not find plugin named \"" + pluginId + "\"")
+ if err != nil {
+ return m.Plugin{}, err
+ }
+
+ var data m.Plugin
+ err = json.Unmarshal(body, &data)
+ if err != nil {
+ logger.Info("Failed to unmarshal graphite response error: %v", err)
+ return m.Plugin{}, err
+ }
+
+ return data, nil
+}
+
+func sendRequest(repoUrl string, subPaths ...string) ([]byte, error) {
+ u, _ := url.Parse(repoUrl)
+ for _, v := range subPaths {
+ u.Path = path.Join(u.Path, v)
+ }
+
+ req, err := http.NewRequest(http.MethodGet, u.String(), nil)
+
+ req.Header.Set("grafana-version", grafanaVersion)
+ req.Header.Set("User-Agent", "grafana "+grafanaVersion)
+
+ if err != nil {
+ return []byte{}, err
+ }
+
+ res, err := HttpClient.Do(req)
+ if err != nil {
+ return []byte{}, err
+ }
+
+ if res.StatusCode/100 != 2 {
+ return []byte{}, fmt.Errorf("Api returned invalid status: %s", res.Status)
+ }
+
+ body, err := ioutil.ReadAll(res.Body)
+ defer res.Body.Close()
+
+ return body, err
}
diff --git a/pkg/cmd/grafana-cli/utils/grafana_path.go b/pkg/cmd/grafana-cli/utils/grafana_path.go
new file mode 100644
index 00000000000..fa6dc46d783
--- /dev/null
+++ b/pkg/cmd/grafana-cli/utils/grafana_path.go
@@ -0,0 +1,46 @@
+package utils
+
+import (
+ "os"
+
+ "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
+)
+
+func GetGrafanaPluginDir(currentOS string) string {
+ //currentOS := runtime.GOOS
+
+ if currentOS == "windows" {
+ return returnOsDefault(currentOS)
+ }
+
+ pwd, err := os.Getwd()
+
+ if err != nil {
+ logger.Error("Could not get current path. using default")
+ return returnOsDefault(currentOS)
+ }
+
+ if isDevenvironment(pwd) {
+ return "../data/plugins"
+ }
+
+ return returnOsDefault(currentOS)
+}
+
+func isDevenvironment(pwd string) bool {
+ // if ../conf/defaults.ini exists, grafana is not installed as package
+ // that its in development environment.
+ _, err := os.Stat("../conf/defaults.ini")
+ return err == nil
+}
+
+func returnOsDefault(currentOs string) string {
+ switch currentOs {
+ case "windows":
+ return "../data/plugins"
+ case "darwin":
+ return "/usr/local/var/lib/grafana/plugins"
+ default: //"linux"
+ return "/var/lib/grafana/plugins"
+ }
+}
diff --git a/pkg/cmd/grafana-server/main.go b/pkg/cmd/grafana-server/main.go
index dad3f437390..46b1d5f2a95 100644
--- a/pkg/cmd/grafana-server/main.go
+++ b/pkg/cmd/grafana-server/main.go
@@ -13,18 +13,21 @@ import (
"time"
"github.com/grafana/grafana/pkg/log"
- "github.com/grafana/grafana/pkg/login"
- "github.com/grafana/grafana/pkg/metrics"
- "github.com/grafana/grafana/pkg/plugins"
- "github.com/grafana/grafana/pkg/services/eventpublisher"
- "github.com/grafana/grafana/pkg/services/notifications"
- "github.com/grafana/grafana/pkg/services/search"
+ "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting"
- "github.com/grafana/grafana/pkg/social"
+
+ _ "github.com/grafana/grafana/pkg/services/alerting/conditions"
+ _ "github.com/grafana/grafana/pkg/services/alerting/notifiers"
+ _ "github.com/grafana/grafana/pkg/tsdb/graphite"
+ _ "github.com/grafana/grafana/pkg/tsdb/influxdb"
+ _ "github.com/grafana/grafana/pkg/tsdb/mqe"
+ _ "github.com/grafana/grafana/pkg/tsdb/opentsdb"
+ _ "github.com/grafana/grafana/pkg/tsdb/prometheus"
+ _ "github.com/grafana/grafana/pkg/tsdb/testdata"
)
-var version = "3.0.0-pre1"
+var version = "4.1.0"
var commit = "NA"
var buildstamp string
var build_date string
@@ -39,7 +42,6 @@ func init() {
}
func main() {
-
v := flag.Bool("v", false, "prints current version and exits")
flag.Parse()
if *v {
@@ -48,33 +50,16 @@ func main() {
}
buildstampInt64, _ := strconv.ParseInt(buildstamp, 10, 64)
+ if buildstampInt64 == 0 {
+ buildstampInt64 = time.Now().Unix()
+ }
setting.BuildVersion = version
setting.BuildCommit = commit
setting.BuildStamp = buildstampInt64
- go listenToSystemSignels()
-
- flag.Parse()
- writePIDFile()
- initRuntime()
-
- search.Init()
- login.Init()
- social.NewOAuthService()
- eventpublisher.Init()
- plugins.Init()
-
- if err := notifications.Init(); err != nil {
- log.Fatal(3, "Notification service failed to initialize", err)
- }
-
- if setting.ReportingEnabled {
- go metrics.StartUsageReportLoop()
- }
-
- StartServer()
- exitChan <- 0
+ server := NewGrafanaServer()
+ server.Start()
}
func initRuntime() {
@@ -88,10 +73,13 @@ func initRuntime() {
log.Fatal(3, err.Error())
}
- log.Info("Starting Grafana")
- log.Info("Version: %v, Commit: %v, Build date: %v", setting.BuildVersion, setting.BuildCommit, time.Unix(setting.BuildStamp, 0))
- setting.LogConfigurationInfo()
+ logger := log.New("main")
+ logger.Info("Starting Grafana", "version", version, "commit", commit, "compiled", time.Unix(setting.BuildStamp, 0))
+ setting.LogConfigurationInfo()
+}
+
+func initSql() {
sqlstore.NewEngine()
sqlstore.EnsureAdminUser()
}
@@ -114,26 +102,18 @@ func writePIDFile() {
}
}
-func listenToSystemSignels() {
+func listenToSystemSignals(server models.GrafanaServer) {
signalChan := make(chan os.Signal, 1)
+ ignoreChan := make(chan os.Signal, 1)
code := 0
- signal.Notify(signalChan, os.Interrupt)
- signal.Notify(signalChan, os.Kill)
- signal.Notify(signalChan, syscall.SIGTERM)
+ signal.Notify(ignoreChan, syscall.SIGHUP)
+ signal.Notify(signalChan, os.Interrupt, os.Kill, syscall.SIGTERM)
select {
case sig := <-signalChan:
- log.Info("Received signal %s. shutting down", sig)
+ server.Shutdown(0, fmt.Sprintf("system signal: %s", sig))
case code = <-exitChan:
- switch code {
- case 0:
- log.Info("Shutting down")
- default:
- log.Warn("Shutting down")
- }
+ server.Shutdown(code, "startup error")
}
-
- log.Close()
- os.Exit(code)
}
diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go
new file mode 100644
index 00000000000..2a4682cbb4b
--- /dev/null
+++ b/pkg/cmd/grafana-server/server.go
@@ -0,0 +1,150 @@
+package main
+
+import (
+ "context"
+ "fmt"
+ "net/http"
+ "os"
+ "time"
+
+ "gopkg.in/macaron.v1"
+
+ "golang.org/x/sync/errgroup"
+
+ "github.com/grafana/grafana/pkg/api"
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/login"
+ "github.com/grafana/grafana/pkg/metrics"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/plugins"
+ "github.com/grafana/grafana/pkg/services/alerting"
+ "github.com/grafana/grafana/pkg/services/cleanup"
+ "github.com/grafana/grafana/pkg/services/eventpublisher"
+ "github.com/grafana/grafana/pkg/services/notifications"
+ "github.com/grafana/grafana/pkg/services/search"
+ "github.com/grafana/grafana/pkg/setting"
+ "github.com/grafana/grafana/pkg/social"
+)
+
+func NewGrafanaServer() models.GrafanaServer {
+ rootCtx, shutdownFn := context.WithCancel(context.Background())
+ childRoutines, childCtx := errgroup.WithContext(rootCtx)
+
+ return &GrafanaServerImpl{
+ context: childCtx,
+ shutdownFn: shutdownFn,
+ childRoutines: childRoutines,
+ log: log.New("server"),
+ }
+}
+
+type GrafanaServerImpl struct {
+ context context.Context
+ shutdownFn context.CancelFunc
+ childRoutines *errgroup.Group
+ log log.Logger
+}
+
+func (g *GrafanaServerImpl) Start() {
+ go listenToSystemSignals(g)
+
+ writePIDFile()
+ initRuntime()
+ initSql()
+ metrics.Init()
+ search.Init()
+ login.Init()
+ social.NewOAuthService()
+ eventpublisher.Init()
+ plugins.Init()
+
+ // init alerting
+ if setting.ExecuteAlerts {
+ engine := alerting.NewEngine()
+ g.childRoutines.Go(func() error { return engine.Run(g.context) })
+ }
+
+ // cleanup service
+ cleanUpService := cleanup.NewCleanUpService()
+ g.childRoutines.Go(func() error { return cleanUpService.Run(g.context) })
+
+ if err := notifications.Init(); err != nil {
+ g.log.Error("Notification service failed to initialize", "erro", err)
+ g.Shutdown(1, "Startup failed")
+ return
+ }
+
+ g.startHttpServer()
+}
+
+func (g *GrafanaServerImpl) startHttpServer() {
+ logger = log.New("http.server")
+
+ var err error
+ m := newMacaron()
+ api.Register(m)
+
+ listenAddr := fmt.Sprintf("%s:%s", setting.HttpAddr, setting.HttpPort)
+ g.log.Info("Initializing HTTP Server", "address", listenAddr, "protocol", setting.Protocol, "subUrl", setting.AppSubUrl)
+
+ switch setting.Protocol {
+ case setting.HTTP:
+ err = http.ListenAndServe(listenAddr, m)
+ case setting.HTTPS:
+ err = ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, m)
+ default:
+ g.log.Error("Invalid protocol", "protocol", setting.Protocol)
+ g.Shutdown(1, "Startup failed")
+ }
+
+ if err != nil {
+ g.log.Error("Fail to start server", "error", err)
+ g.Shutdown(1, "Startup failed")
+ return
+ }
+}
+
+func (g *GrafanaServerImpl) Shutdown(code int, reason string) {
+ g.log.Info("Shutdown started", "code", code, "reason", reason)
+
+ g.shutdownFn()
+ err := g.childRoutines.Wait()
+
+ g.log.Info("Shutdown completed", "reason", err)
+ log.Close()
+ os.Exit(code)
+}
+
+func ListenAndServeTLS(listenAddr, certfile, keyfile string, m *macaron.Macaron) error {
+ if certfile == "" {
+ return fmt.Errorf("cert_file cannot be empty when using HTTPS")
+ }
+
+ if keyfile == "" {
+ return fmt.Errorf("cert_key cannot be empty when using HTTPS")
+ }
+
+ if _, err := os.Stat(setting.CertFile); os.IsNotExist(err) {
+ return fmt.Errorf(`Cannot find SSL cert_file at %v`, setting.CertFile)
+ }
+
+ if _, err := os.Stat(setting.KeyFile); os.IsNotExist(err) {
+ return fmt.Errorf(`Cannot find SSL key_file at %v`, setting.KeyFile)
+ }
+
+ return http.ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, m)
+}
+
+// implement context.Context
+func (g *GrafanaServerImpl) Deadline() (deadline time.Time, ok bool) {
+ return g.context.Deadline()
+}
+func (g *GrafanaServerImpl) Done() <-chan struct{} {
+ return g.context.Done()
+}
+func (g *GrafanaServerImpl) Err() error {
+ return g.context.Err()
+}
+func (g *GrafanaServerImpl) Value(key interface{}) interface{} {
+ return g.context.Value(key)
+}
diff --git a/pkg/cmd/grafana-server/web.go b/pkg/cmd/grafana-server/web.go
index 0d78de0daae..07a2f82b172 100644
--- a/pkg/cmd/grafana-server/web.go
+++ b/pkg/cmd/grafana-server/web.go
@@ -18,12 +18,14 @@ import (
"github.com/grafana/grafana/pkg/setting"
)
+var logger log.Logger
+
func newMacaron() *macaron.Macaron {
macaron.Env = setting.Env
m := macaron.New()
m.Use(middleware.Logger())
- m.Use(macaron.Recovery())
+ m.Use(middleware.Recovery())
if setting.EnableGzip {
m.Use(middleware.Gziper())
@@ -31,7 +33,7 @@ func newMacaron() *macaron.Macaron {
for _, route := range plugins.StaticRoutes {
pluginRoute := path.Join("/public/plugins/", route.PluginId)
- log.Info("Plugins: Adding route %s -> %s", pluginRoute, route.Directory)
+ logger.Debug("Plugins: Adding route", "route", pluginRoute, "dir", route.Directory)
mapStatic(m, route.Directory, "", pluginRoute)
}
@@ -44,13 +46,15 @@ func newMacaron() *macaron.Macaron {
Delims: macaron.Delims{Left: "[[", Right: "]]"},
}))
+ m.Use(middleware.GetContextHandler())
+ m.Use(middleware.Sessioner(&setting.SessionOptions))
+ m.Use(middleware.RequestMetrics())
+
+ // needs to be after context handler
if setting.EnforceDomain {
m.Use(middleware.ValidateHostHeader(setting.Domain))
}
- m.Use(middleware.GetContextHandler())
- m.Use(middleware.Sessioner(&setting.SessionOptions))
-
return m
}
@@ -75,24 +79,29 @@ func mapStatic(m *macaron.Macaron, rootDir string, dir string, prefix string) {
))
}
-func StartServer() {
+func StartServer() int {
+ logger = log.New("server")
var err error
m := newMacaron()
api.Register(m)
listenAddr := fmt.Sprintf("%s:%s", setting.HttpAddr, setting.HttpPort)
- log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, setting.AppSubUrl)
+ logger.Info("Server Listening", "address", listenAddr, "protocol", setting.Protocol, "subUrl", setting.AppSubUrl)
switch setting.Protocol {
case setting.HTTP:
err = http.ListenAndServe(listenAddr, m)
case setting.HTTPS:
err = http.ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, m)
default:
- log.Fatal(4, "Invalid protocol: %s", setting.Protocol)
+ logger.Error("Invalid protocol", "protocol", setting.Protocol)
+ return 1
}
if err != nil {
- log.Fatal(4, "Fail to start server: %v", err)
+ logger.Error("Fail to start server", "error", err)
+ return 1
}
+
+ return 0
}
diff --git a/pkg/components/imguploader/imguploader.go b/pkg/components/imguploader/imguploader.go
new file mode 100644
index 00000000000..1cbe55c8572
--- /dev/null
+++ b/pkg/components/imguploader/imguploader.go
@@ -0,0 +1,64 @@
+package imguploader
+
+import (
+ "fmt"
+
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+type ImageUploader interface {
+ Upload(path string) (string, error)
+}
+
+type NopImageUploader struct {
+}
+
+func (NopImageUploader) Upload(path string) (string, error) {
+ return "", nil
+}
+
+func NewImageUploader() (ImageUploader, error) {
+
+ switch setting.ImageUploadProvider {
+ case "s3":
+ s3sec, err := setting.Cfg.GetSection("external_image_storage.s3")
+ if err != nil {
+ return nil, err
+ }
+
+ bucket := s3sec.Key("bucket_url").MustString("")
+ accessKey := s3sec.Key("access_key").MustString("")
+ secretKey := s3sec.Key("secret_key").MustString("")
+
+ if bucket == "" {
+ return nil, fmt.Errorf("Could not find bucket setting for image.uploader.s3")
+ }
+
+ if accessKey == "" {
+ return nil, fmt.Errorf("Could not find accessKey setting for image.uploader.s3")
+ }
+
+ if secretKey == "" {
+ return nil, fmt.Errorf("Could not find secretKey setting for image.uploader.s3")
+ }
+
+ return NewS3Uploader(bucket, accessKey, secretKey), nil
+ case "webdav":
+ webdavSec, err := setting.Cfg.GetSection("external_image_storage.webdav")
+ if err != nil {
+ return nil, err
+ }
+
+ url := webdavSec.Key("url").String()
+ if url == "" {
+ return nil, fmt.Errorf("Could not find url key for image.uploader.webdav")
+ }
+
+ username := webdavSec.Key("username").String()
+ password := webdavSec.Key("password").String()
+
+ return NewWebdavImageUploader(url, username, password)
+ }
+
+ return NopImageUploader{}, nil
+}
diff --git a/pkg/components/imguploader/imguploader_test.go b/pkg/components/imguploader/imguploader_test.go
new file mode 100644
index 00000000000..4a18f22c173
--- /dev/null
+++ b/pkg/components/imguploader/imguploader_test.go
@@ -0,0 +1,62 @@
+package imguploader
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/setting"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestImageUploaderFactory(t *testing.T) {
+ Convey("Can create image uploader for ", t, func() {
+ Convey("S3ImageUploader", func() {
+ var err error
+ setting.NewConfigContext(&setting.CommandLineArgs{
+ HomePath: "../../../",
+ })
+
+ setting.ImageUploadProvider = "s3"
+
+ s3sec, err := setting.Cfg.GetSection("external_image_storage.s3")
+ s3sec.NewKey("bucket_url", "bucket_url")
+ s3sec.NewKey("access_key", "access_key")
+ s3sec.NewKey("secret_key", "secret_key")
+
+ uploader, err := NewImageUploader()
+
+ So(err, ShouldBeNil)
+ original, ok := uploader.(*S3Uploader)
+
+ So(ok, ShouldBeTrue)
+ So(original.accessKey, ShouldEqual, "access_key")
+ So(original.secretKey, ShouldEqual, "secret_key")
+ So(original.bucket, ShouldEqual, "bucket_url")
+ })
+
+ Convey("Webdav uploader", func() {
+ var err error
+
+ setting.NewConfigContext(&setting.CommandLineArgs{
+ HomePath: "../../../",
+ })
+
+ setting.ImageUploadProvider = "webdav"
+
+ webdavSec, err := setting.Cfg.GetSection("external_image_storage.webdav")
+ webdavSec.NewKey("url", "webdavUrl")
+ webdavSec.NewKey("username", "username")
+ webdavSec.NewKey("password", "password")
+
+ uploader, err := NewImageUploader()
+
+ So(err, ShouldBeNil)
+ original, ok := uploader.(*WebdavUploader)
+
+ So(ok, ShouldBeTrue)
+ So(original.url, ShouldEqual, "webdavUrl")
+ So(original.username, ShouldEqual, "username")
+ So(original.password, ShouldEqual, "password")
+ })
+ })
+}
diff --git a/pkg/components/imguploader/s3uploader.go b/pkg/components/imguploader/s3uploader.go
new file mode 100644
index 00000000000..59ec598412b
--- /dev/null
+++ b/pkg/components/imguploader/s3uploader.go
@@ -0,0 +1,69 @@
+package imguploader
+
+import (
+ "io/ioutil"
+ "net/http"
+ "net/url"
+ "path"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/util"
+ "github.com/kr/s3/s3util"
+)
+
+type S3Uploader struct {
+ bucket string
+ secretKey string
+ accessKey string
+ log log.Logger
+}
+
+func NewS3Uploader(bucket, accessKey, secretKey string) *S3Uploader {
+ return &S3Uploader{
+ bucket: bucket,
+ accessKey: accessKey,
+ secretKey: secretKey,
+ log: log.New("s3uploader"),
+ }
+}
+
+func (u *S3Uploader) Upload(imageDiskPath string) (string, error) {
+
+ s3util.DefaultConfig.AccessKey = u.accessKey
+ s3util.DefaultConfig.SecretKey = u.secretKey
+
+ header := make(http.Header)
+ header.Add("x-amz-acl", "public-read")
+ header.Add("Content-Type", "image/png")
+
+ var imageUrl *url.URL
+ var err error
+
+ if imageUrl, err = url.Parse(u.bucket); err != nil {
+ return "", err
+ }
+
+ // add image to url
+ imageUrl.Path = path.Join(imageUrl.Path, util.GetRandomString(20)+".png")
+ imageUrlString := imageUrl.String()
+ log.Debug("Uploading image to s3", "url", imageUrlString)
+
+ writer, err := s3util.Create(imageUrlString, header, nil)
+ if err != nil {
+ return "", err
+ }
+
+ defer writer.Close()
+
+ imgData, err := ioutil.ReadFile(imageDiskPath)
+ if err != nil {
+ return "", err
+ }
+
+ _, err = writer.Write(imgData)
+ if err != nil {
+ return "", err
+ }
+
+ return imageUrlString, nil
+}
diff --git a/pkg/components/imguploader/s3uploader_test.go b/pkg/components/imguploader/s3uploader_test.go
new file mode 100644
index 00000000000..1204a2db4e2
--- /dev/null
+++ b/pkg/components/imguploader/s3uploader_test.go
@@ -0,0 +1,23 @@
+package imguploader
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/setting"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestUploadToS3(t *testing.T) {
+ SkipConvey("[Integration test] for external_image_store.webdav", t, func() {
+ setting.NewConfigContext(&setting.CommandLineArgs{
+ HomePath: "../../../",
+ })
+
+ s3Uploader, _ := NewImageUploader()
+
+ path, err := s3Uploader.Upload("../../../public/img/logo_transparent_400x.png")
+
+ So(err, ShouldBeNil)
+ So(path, ShouldNotEqual, "")
+ })
+}
diff --git a/pkg/components/imguploader/webdavuploader.go b/pkg/components/imguploader/webdavuploader.go
new file mode 100644
index 00000000000..541a44d4b4a
--- /dev/null
+++ b/pkg/components/imguploader/webdavuploader.go
@@ -0,0 +1,51 @@
+package imguploader
+
+import (
+ "bytes"
+ "fmt"
+ "io/ioutil"
+ "net/http"
+ "net/url"
+ "path"
+
+ "github.com/grafana/grafana/pkg/util"
+)
+
+type WebdavUploader struct {
+ url string
+ username string
+ password string
+}
+
+func (u *WebdavUploader) Upload(pa string) (string, error) {
+ url, _ := url.Parse(u.url)
+ url.Path = path.Join(url.Path, util.GetRandomString(20)+".png")
+
+ imgData, err := ioutil.ReadFile(pa)
+ req, err := http.NewRequest("PUT", url.String(), bytes.NewReader(imgData))
+
+ if u.username != "" {
+ req.SetBasicAuth(u.username, u.password)
+ }
+
+ res, err := http.DefaultClient.Do(req)
+
+ if err != nil {
+ return "", err
+ }
+
+ if res.StatusCode != http.StatusCreated {
+ body, _ := ioutil.ReadAll(res.Body)
+ return "", fmt.Errorf("Failed to upload image. Returned statuscode %v body %s", res.StatusCode, body)
+ }
+
+ return url.String(), nil
+}
+
+func NewWebdavImageUploader(url, username, passwrod string) (*WebdavUploader, error) {
+ return &WebdavUploader{
+ url: url,
+ username: username,
+ password: passwrod,
+ }, nil
+}
diff --git a/pkg/components/imguploader/webdavuploader_test.go b/pkg/components/imguploader/webdavuploader_test.go
new file mode 100644
index 00000000000..273cd1c2a86
--- /dev/null
+++ b/pkg/components/imguploader/webdavuploader_test.go
@@ -0,0 +1,18 @@
+package imguploader
+
+import (
+ "testing"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestUploadToWebdav(t *testing.T) {
+ webdavUploader, _ := NewWebdavImageUploader("http://localhost:9998/dav/", "username", "password")
+
+ SkipConvey("[Integration test] for external_image_store.webdav", t, func() {
+ path, err := webdavUploader.Upload("../../../public/img/logo_transparent_400x.png")
+
+ So(err, ShouldBeNil)
+ So(path, ShouldNotEqual, "")
+ })
+}
diff --git a/pkg/components/renderer/renderer.go b/pkg/components/renderer/renderer.go
index f81da43c295..6db6a6c3d35 100644
--- a/pkg/components/renderer/renderer.go
+++ b/pkg/components/renderer/renderer.go
@@ -1,6 +1,7 @@
package renderer
import (
+ "fmt"
"io"
"os"
"os/exec"
@@ -8,36 +9,60 @@ import (
"runtime"
"time"
+ "strconv"
+
"github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
- "strconv"
)
type RenderOpts struct {
- Url string
- Width string
- Height string
- SessionId string
- Timeout string
+ Path string
+ Width string
+ Height string
+ Timeout string
+ OrgId int64
}
+var rendererLog log.Logger = log.New("png-renderer")
+
func RenderToPng(params *RenderOpts) (string, error) {
- log.Info("PhantomRenderer::renderToPng url %v", params.Url)
+ rendererLog.Info("Rendering", "path", params.Path)
var executable = "phantomjs"
if runtime.GOOS == "windows" {
executable = executable + ".exe"
}
+ localDomain := "localhost"
+ if setting.HttpAddr != setting.DEFAULT_HTTP_ADDR {
+ localDomain = setting.HttpAddr
+ }
+
+ url := fmt.Sprintf("%s://%s:%s/%s", setting.Protocol, localDomain, setting.HttpPort, params.Path)
+
binPath, _ := filepath.Abs(filepath.Join(setting.PhantomDir, executable))
scriptPath, _ := filepath.Abs(filepath.Join(setting.PhantomDir, "render.js"))
pngPath, _ := filepath.Abs(filepath.Join(setting.ImagesDir, util.GetRandomString(20)))
pngPath = pngPath + ".png"
- cmd := exec.Command(binPath, "--ignore-ssl-errors=true", scriptPath, "url="+params.Url, "width="+params.Width,
- "height="+params.Height, "png="+pngPath, "cookiename="+setting.SessionOptions.CookieName,
- "domain="+setting.Domain, "sessionid="+params.SessionId)
+ renderKey := middleware.AddRenderAuthKey(params.OrgId)
+ defer middleware.RemoveRenderAuthKey(renderKey)
+
+ cmdArgs := []string{
+ "--ignore-ssl-errors=true",
+ "--web-security=false",
+ scriptPath,
+ "url=" + url,
+ "width=" + params.Width,
+ "height=" + params.Height,
+ "png=" + pngPath,
+ "domain=" + localDomain,
+ "renderKey=" + renderKey,
+ }
+
+ cmd := exec.Command(binPath, cmdArgs...)
stdout, err := cmd.StdoutPipe()
if err != nil {
@@ -70,10 +95,12 @@ func RenderToPng(params *RenderOpts) (string, error) {
select {
case <-time.After(time.Duration(timeout) * time.Second):
if err := cmd.Process.Kill(); err != nil {
- log.Error(4, "failed to kill: %v", err)
+ rendererLog.Error("failed to kill", "error", err)
}
+ return "", fmt.Errorf("PhantomRenderer::renderToPng timeout (>%vs)", timeout)
case <-done:
}
+ rendererLog.Debug("Image rendered", "path", pngPath)
return pngPath, nil
}
diff --git a/pkg/components/securejsondata/securejsondata.go b/pkg/components/securejsondata/securejsondata.go
new file mode 100644
index 00000000000..d7bec6894b0
--- /dev/null
+++ b/pkg/components/securejsondata/securejsondata.go
@@ -0,0 +1,24 @@
+package securejsondata
+
+import (
+ "github.com/grafana/grafana/pkg/setting"
+ "github.com/grafana/grafana/pkg/util"
+)
+
+type SecureJsonData map[string][]byte
+
+func (s SecureJsonData) Decrypt() map[string]string {
+ decrypted := make(map[string]string)
+ for key, data := range s {
+ decrypted[key] = string(util.Decrypt(data, setting.SecretKey))
+ }
+ return decrypted
+}
+
+func GetEncryptedJsonData(sjd map[string]string) SecureJsonData {
+ encrypted := make(SecureJsonData)
+ for key, data := range sjd {
+ encrypted[key] = util.Encrypt([]byte(data), setting.SecretKey)
+ }
+ return encrypted
+}
diff --git a/pkg/log/console.go b/pkg/log/console.go
deleted file mode 100644
index 401afd7e106..00000000000
--- a/pkg/log/console.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2014 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package log
-
-import (
- "encoding/json"
- "fmt"
- "log"
- "os"
- "runtime"
-)
-
-type Brush func(string) string
-
-func NewBrush(color string) Brush {
- pre := "\033["
- reset := "\033[0m"
- return func(text string) string {
- return pre + color + "m" + text + reset
- }
-}
-
-var (
- Red = NewBrush("1;31")
- Purple = NewBrush("1;35")
- Yellow = NewBrush("1;33")
- Green = NewBrush("1;32")
- Blue = NewBrush("1;34")
- Cyan = NewBrush("1;36")
-
- colors = []Brush{
- Cyan, // Trace cyan
- Blue, // Debug blue
- Green, // Info green
- Yellow, // Warn yellow
- Red, // Error red
- Purple, // Critical purple
- Red, // Fatal red
- }
- consoleWriter = &ConsoleWriter{lg: log.New(os.Stdout, "", 0),
- Level: TRACE}
-)
-
-// ConsoleWriter implements LoggerInterface and writes messages to terminal.
-type ConsoleWriter struct {
- lg *log.Logger
- Level LogLevel `json:"level"`
- Formatting bool `json:"formatting"`
-}
-
-// create ConsoleWriter returning as LoggerInterface.
-func NewConsole() LoggerInterface {
- return &ConsoleWriter{
- lg: log.New(os.Stderr, "", log.Ldate|log.Ltime),
- Level: TRACE,
- Formatting: true,
- }
-}
-
-func (cw *ConsoleWriter) Init(config string) error {
- return json.Unmarshal([]byte(config), cw)
-}
-
-func (cw *ConsoleWriter) WriteMsg(msg string, skip int, level LogLevel) error {
- if cw.Level > level {
- return nil
- }
- if runtime.GOOS == "windows" || !cw.Formatting {
- cw.lg.Println(msg)
- } else {
- cw.lg.Println(colors[level](msg))
- }
- return nil
-}
-
-func (_ *ConsoleWriter) Flush() {
-
-}
-
-func (_ *ConsoleWriter) Destroy() {
-}
-
-func printConsole(level LogLevel, msg string) {
- consoleWriter.WriteMsg(msg, 0, level)
-}
-
-func printfConsole(level LogLevel, format string, v ...interface{}) {
- consoleWriter.WriteMsg(fmt.Sprintf(format, v...), 0, level)
-}
-
-// ConsoleTrace prints to stdout using TRACE colors
-func ConsoleTrace(s string) {
- printConsole(TRACE, s)
-}
-
-// ConsoleTracef prints a formatted string to stdout using TRACE colors
-func ConsoleTracef(format string, v ...interface{}) {
- printfConsole(TRACE, format, v...)
-}
-
-// ConsoleDebug prints to stdout using DEBUG colors
-func ConsoleDebug(s string) {
- printConsole(DEBUG, s)
-}
-
-// ConsoleDebugf prints a formatted string to stdout using DEBUG colors
-func ConsoleDebugf(format string, v ...interface{}) {
- printfConsole(DEBUG, format, v...)
-}
-
-// ConsoleInfo prints to stdout using INFO colors
-func ConsoleInfo(s string) {
- printConsole(INFO, s)
-}
-
-// ConsoleInfof prints a formatted string to stdout using INFO colors
-func ConsoleInfof(format string, v ...interface{}) {
- printfConsole(INFO, format, v...)
-}
-
-// ConsoleWarn prints to stdout using WARN colors
-func ConsoleWarn(s string) {
- printConsole(WARN, s)
-}
-
-// ConsoleWarnf prints a formatted string to stdout using WARN colors
-func ConsoleWarnf(format string, v ...interface{}) {
- printfConsole(WARN, format, v...)
-}
-
-// ConsoleError prints to stdout using ERROR colors
-func ConsoleError(s string) {
- printConsole(ERROR, s)
-}
-
-// ConsoleErrorf prints a formatted string to stdout using ERROR colors
-func ConsoleErrorf(format string, v ...interface{}) {
- printfConsole(ERROR, format, v...)
-}
-
-// ConsoleFatal prints to stdout using FATAL colors
-func ConsoleFatal(s string) {
- printConsole(FATAL, s)
- os.Exit(1)
-}
-
-// ConsoleFatalf prints a formatted string to stdout using FATAL colors
-func ConsoleFatalf(format string, v ...interface{}) {
- printfConsole(FATAL, format, v...)
- os.Exit(1)
-}
-
-func init() {
- Register("console", NewConsole)
-}
diff --git a/pkg/log/file.go b/pkg/log/file.go
index 6031cd5dede..a8d35ba6b81 100644
--- a/pkg/log/file.go
+++ b/pkg/log/file.go
@@ -5,43 +5,39 @@
package log
import (
- "encoding/json"
"errors"
"fmt"
"io/ioutil"
- "log"
"os"
"path/filepath"
"strings"
"sync"
"time"
+
+ "github.com/inconshreveable/log15"
)
// FileLogWriter implements LoggerInterface.
// It writes messages by lines limit, file size limit, or time frequency.
type FileLogWriter struct {
- *log.Logger
mw *MuxWriter
- // The opened file
- Filename string `json:"filename"`
- Maxlines int `json:"maxlines"`
+ Format log15.Format
+ Filename string
+ Maxlines int
maxlines_curlines int
// Rotate at size
- Maxsize int `json:"maxsize"`
+ Maxsize int
maxsize_cursize int
// Rotate daily
- Daily bool `json:"daily"`
- Maxdays int64 `json:"maxdays"`
+ Daily bool
+ Maxdays int64
daily_opendate int
- Rotate bool `json:"rotate"`
-
- startLock sync.Mutex // Only one log can write to the file
-
- Level LogLevel `json:"level"`
+ Rotate bool
+ startLock sync.Mutex
}
// an *os.File writer with locker.
@@ -66,37 +62,29 @@ func (l *MuxWriter) SetFd(fd *os.File) {
}
// create a FileLogWriter returning as LoggerInterface.
-func NewFileWriter() LoggerInterface {
+func NewFileWriter() *FileLogWriter {
w := &FileLogWriter{
Filename: "",
+ Format: log15.LogfmtFormat(),
Maxlines: 1000000,
Maxsize: 1 << 28, //256 MB
Daily: true,
Maxdays: 7,
Rotate: true,
- Level: TRACE,
}
// use MuxWriter instead direct use os.File for lock write when rotate
w.mw = new(MuxWriter)
- // set MuxWriter as Logger's io.Writer
- w.Logger = log.New(w.mw, "", log.Ldate|log.Ltime)
return w
}
-// Init file logger with json config.
-// config like:
-// {
-// "filename":"log/gogs.log",
-// "maxlines":10000,
-// "maxsize":1<<30,
-// "daily":true,
-// "maxdays":15,
-// "rotate":true
-// }
-func (w *FileLogWriter) Init(config string) error {
- if err := json.Unmarshal([]byte(config), w); err != nil {
- return err
- }
+func (w *FileLogWriter) Log(r *log15.Record) error {
+ data := w.Format.Format(r)
+ w.docheck(len(data))
+ _, err := w.mw.Write(data)
+ return err
+}
+
+func (w *FileLogWriter) Init() error {
if len(w.Filename) == 0 {
return errors.New("config must have filename")
}
@@ -131,17 +119,6 @@ func (w *FileLogWriter) docheck(size int) {
w.maxsize_cursize += size
}
-// write logger message into file.
-func (w *FileLogWriter) WriteMsg(msg string, skip int, level LogLevel) error {
- if level < w.Level {
- return nil
- }
- n := 24 + len(msg) // 24 stand for the length "2013/06/23 21:00:22 [T] "
- w.docheck(n)
- w.Logger.Println(msg)
- return nil
-}
-
func (w *FileLogWriter) createLogFile() (*os.File, error) {
// Open the log file
return os.OpenFile(w.Filename, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
@@ -227,7 +204,7 @@ func (w *FileLogWriter) deleteOldLog() {
}
// destroy file logger, close file writer.
-func (w *FileLogWriter) Destroy() {
+func (w *FileLogWriter) Close() {
w.mw.fd.Close()
}
@@ -237,7 +214,3 @@ func (w *FileLogWriter) Destroy() {
func (w *FileLogWriter) Flush() {
w.mw.fd.Sync()
}
-
-func init() {
- Register("file", NewFileWriter)
-}
diff --git a/pkg/log/handlers.go b/pkg/log/handlers.go
new file mode 100644
index 00000000000..14a96fdcdb4
--- /dev/null
+++ b/pkg/log/handlers.go
@@ -0,0 +1,5 @@
+package log
+
+type DisposableHandler interface {
+ Close()
+}
diff --git a/pkg/log/interface.go b/pkg/log/interface.go
new file mode 100644
index 00000000000..234b1c38c5c
--- /dev/null
+++ b/pkg/log/interface.go
@@ -0,0 +1,31 @@
+package log
+
+import "github.com/inconshreveable/log15"
+
+type Lvl int
+
+const (
+ LvlCrit Lvl = iota
+ LvlError
+ LvlWarn
+ LvlInfo
+ LvlDebug
+)
+
+type Logger interface {
+ // New returns a new Logger that has this logger's context plus the given context
+ New(ctx ...interface{}) log15.Logger
+
+ // GetHandler gets the handler associated with the logger.
+ GetHandler() log15.Handler
+
+ // SetHandler updates the logger to write records to the specified handler.
+ SetHandler(h log15.Handler)
+
+ // Log a message at the given level with context key/value pairs
+ Debug(msg string, ctx ...interface{})
+ Info(msg string, ctx ...interface{})
+ Warn(msg string, ctx ...interface{})
+ Error(msg string, ctx ...interface{})
+ Crit(msg string, ctx ...interface{})
+}
diff --git a/pkg/log/log.go b/pkg/log/log.go
index f6d6ce74def..fe0b312db23 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -8,324 +8,250 @@ import (
"fmt"
"os"
"path/filepath"
- "runtime"
"strings"
- "sync"
+
+ "gopkg.in/ini.v1"
+
+ "github.com/go-stack/stack"
+ "github.com/inconshreveable/log15"
+ "github.com/inconshreveable/log15/term"
)
-var (
- loggers []*Logger
-)
+var Root log15.Logger
+var loggersToClose []DisposableHandler
-func NewLogger(bufLen int64, mode, config string) {
- logger := newLogger(bufLen)
-
- isExist := false
- for _, l := range loggers {
- if l.adapter == mode {
- isExist = true
- l = logger
- }
- }
- if !isExist {
- loggers = append(loggers, logger)
- }
- if err := logger.SetLogger(mode, config); err != nil {
- Fatal(1, "Fail to set logger(%s): %v", mode, err)
- }
+func init() {
+ loggersToClose = make([]DisposableHandler, 0)
+ Root = log15.Root()
+ Root.SetHandler(log15.DiscardHandler())
}
-// this helps you work around the performance annoyance mentioned in
-// https://github.com/grafana/grafana/issues/4055
-// until we refactor this library completely
-func Level(level LogLevel) {
- for i := range loggers {
- loggers[i].level = level
- }
+func New(logger string, ctx ...interface{}) Logger {
+ params := append([]interface{}{"logger", logger}, ctx...)
+ return Root.New(params...)
}
func Trace(format string, v ...interface{}) {
- for _, logger := range loggers {
- logger.Trace(format, v...)
+ var message string
+ if len(v) > 0 {
+ message = fmt.Sprintf(format, v)
+ } else {
+ message = format
}
+
+ Root.Debug(message)
}
func Debug(format string, v ...interface{}) {
- for _, logger := range loggers {
- logger.Debug(format, v...)
+ var message string
+ if len(v) > 0 {
+ message = fmt.Sprintf(format, v)
+ } else {
+ message = format
}
+
+ Root.Debug(message)
+}
+
+func Debug2(message string, v ...interface{}) {
+ Root.Debug(message, v...)
}
func Info(format string, v ...interface{}) {
- for _, logger := range loggers {
- logger.Info(format, v...)
+ var message string
+ if len(v) > 0 {
+ message = fmt.Sprintf(format, v)
+ } else {
+ message = format
}
+
+ Root.Info(message)
+}
+
+func Info2(message string, v ...interface{}) {
+ Root.Info(message, v...)
}
func Warn(format string, v ...interface{}) {
- for _, logger := range loggers {
- logger.Warn(format, v...)
+ var message string
+ if len(v) > 0 {
+ message = fmt.Sprintf(format, v)
+ } else {
+ message = format
}
+
+ Root.Warn(message)
+}
+
+func Warn2(message string, v ...interface{}) {
+ Root.Warn(message, v...)
}
func Error(skip int, format string, v ...interface{}) {
- for _, logger := range loggers {
- logger.Error(skip, format, v...)
- }
+ Root.Error(fmt.Sprintf(format, v))
+}
+
+func Error2(message string, v ...interface{}) {
+ Root.Error(message, v...)
}
func Critical(skip int, format string, v ...interface{}) {
- for _, logger := range loggers {
- logger.Critical(skip, format, v...)
- }
+ Root.Crit(fmt.Sprintf(format, v))
}
func Fatal(skip int, format string, v ...interface{}) {
- Error(skip, format, v...)
- for _, l := range loggers {
- l.Close()
- }
+ Root.Crit(fmt.Sprintf(format, v))
+ Close()
os.Exit(1)
}
func Close() {
- for _, l := range loggers {
- l.Close()
- // delete the logger.
- l = nil
+ for _, logger := range loggersToClose {
+ logger.Close()
}
- // clear the loggers slice.
- loggers = nil
+ loggersToClose = make([]DisposableHandler, 0)
}
-// .___ __ _____
-// | | _____/ |_ ____________/ ____\____ ____ ____
-// | |/ \ __\/ __ \_ __ \ __\\__ \ _/ ___\/ __ \
-// | | | \ | \ ___/| | \/| | / __ \\ \__\ ___/
-// |___|___| /__| \___ >__| |__| (____ /\___ >___ >
-// \/ \/ \/ \/ \/
-
-type LogLevel int
-
-const (
- TRACE LogLevel = iota
- DEBUG
- INFO
- WARN
- ERROR
- CRITICAL
- FATAL
-)
-
-// LoggerInterface represents behaviors of a logger provider.
-type LoggerInterface interface {
- Init(config string) error
- WriteMsg(msg string, skip int, level LogLevel) error
- Destroy()
- Flush()
+var logLevels = map[string]log15.Lvl{
+ "trace": log15.LvlDebug,
+ "debug": log15.LvlDebug,
+ "info": log15.LvlInfo,
+ "warn": log15.LvlWarn,
+ "error": log15.LvlError,
+ "critical": log15.LvlCrit,
}
-type loggerType func() LoggerInterface
+func getLogLevelFromConfig(key string, defaultName string, cfg *ini.File) (string, log15.Lvl) {
+ levelName := cfg.Section(key).Key("level").MustString(defaultName)
+ levelName = strings.ToLower(levelName)
+ level := getLogLevelFromString(levelName)
+ return levelName, level
+}
-var adapters = make(map[string]loggerType)
+func getLogLevelFromString(levelName string) log15.Lvl {
+ level, ok := logLevels[levelName]
-// Register registers given logger provider to adapters.
-func Register(name string, log loggerType) {
- if log == nil {
- panic("log: register provider is nil")
+ if !ok {
+ Root.Error("Unknown log level", "level", levelName)
+ return log15.LvlError
}
- if _, dup := adapters[name]; dup {
- panic("log: register called twice for provider \"" + name + "\"")
- }
- adapters[name] = log
+
+ return level
}
-type logMsg struct {
- skip int
- level LogLevel
- msg string
-}
+func getFilters(filterStrArray []string) map[string]log15.Lvl {
+ filterMap := make(map[string]log15.Lvl)
-// Logger is default logger in beego application.
-// it can contain several providers and log message into all providers.
-type Logger struct {
- adapter string
- lock sync.Mutex
- level LogLevel
- msg chan *logMsg
- outputs map[string]LoggerInterface
- quit chan bool
-}
-
-// newLogger initializes and returns a new logger.
-func newLogger(buffer int64) *Logger {
- l := &Logger{
- msg: make(chan *logMsg, buffer),
- outputs: make(map[string]LoggerInterface),
- quit: make(chan bool),
- }
- go l.StartLogger()
- return l
-}
-
-// SetLogger sets new logger instanse with given logger adapter and config.
-func (l *Logger) SetLogger(adapter string, config string) error {
- l.lock.Lock()
- defer l.lock.Unlock()
- if log, ok := adapters[adapter]; ok {
- lg := log()
- if err := lg.Init(config); err != nil {
- return err
+ for _, filterStr := range filterStrArray {
+ parts := strings.Split(filterStr, ":")
+ if len(parts) > 1 {
+ filterMap[parts[0]] = getLogLevelFromString(parts[1])
}
- l.outputs[adapter] = lg
- l.adapter = adapter
- } else {
- panic("log: unknown adapter \"" + adapter + "\" (forgotten register?)")
}
- return nil
+
+ return filterMap
}
-// DelLogger removes a logger adapter instance.
-func (l *Logger) DelLogger(adapter string) error {
- l.lock.Lock()
- defer l.lock.Unlock()
- if lg, ok := l.outputs[adapter]; ok {
- lg.Destroy()
- delete(l.outputs, adapter)
- } else {
- panic("log: unknown adapter \"" + adapter + "\" (forgotten register?)")
+func getLogFormat(format string) log15.Format {
+ switch format {
+ case "console":
+ if term.IsTty(os.Stdout.Fd()) {
+ return log15.TerminalFormat()
+ }
+ return log15.LogfmtFormat()
+ case "text":
+ return log15.LogfmtFormat()
+ case "json":
+ return log15.JsonFormat()
+ default:
+ return log15.LogfmtFormat()
}
- return nil
}
-func (l *Logger) writerMsg(skip int, level LogLevel, msg string) error {
- lm := &logMsg{
- skip: skip,
- level: level,
- }
+func ReadLoggingConfig(modes []string, logsPath string, cfg *ini.File) {
+ Close()
- // Only error information needs locate position for debugging.
- if lm.level >= ERROR {
- pc, file, line, ok := runtime.Caller(skip)
- if ok {
- // Get caller function name.
- fn := runtime.FuncForPC(pc)
- var fnName string
- if fn == nil {
- fnName = "?()"
- } else {
- fnName = strings.TrimLeft(filepath.Ext(fn.Name()), ".") + "()"
+ defaultLevelName, _ := getLogLevelFromConfig("log", "info", cfg)
+ defaultFilters := getFilters(cfg.Section("log").Key("filters").Strings(" "))
+
+ handlers := make([]log15.Handler, 0)
+
+ for _, mode := range modes {
+ mode = strings.TrimSpace(mode)
+ sec, err := cfg.GetSection("log." + mode)
+ if err != nil {
+ Root.Error("Unknown log mode", "mode", mode)
+ }
+
+ // Log level.
+ _, level := getLogLevelFromConfig("log."+mode, defaultLevelName, cfg)
+ modeFilters := getFilters(sec.Key("filters").Strings(" "))
+ format := getLogFormat(sec.Key("format").MustString(""))
+
+ var handler log15.Handler
+
+ // Generate log configuration.
+ switch mode {
+ case "console":
+ handler = log15.StreamHandler(os.Stdout, format)
+ case "file":
+ fileName := sec.Key("file_name").MustString(filepath.Join(logsPath, "grafana.log"))
+ os.MkdirAll(filepath.Dir(fileName), os.ModePerm)
+ fileHandler := NewFileWriter()
+ fileHandler.Filename = fileName
+ fileHandler.Format = format
+ fileHandler.Rotate = sec.Key("log_rotate").MustBool(true)
+ fileHandler.Maxlines = sec.Key("max_lines").MustInt(1000000)
+ fileHandler.Maxsize = 1 << uint(sec.Key("max_size_shift").MustInt(28))
+ fileHandler.Daily = sec.Key("daily_rotate").MustBool(true)
+ fileHandler.Maxdays = sec.Key("max_days").MustInt64(7)
+ fileHandler.Init()
+
+ loggersToClose = append(loggersToClose, fileHandler)
+ handler = fileHandler
+ case "syslog":
+ sysLogHandler := NewSyslog(sec, format)
+
+ loggersToClose = append(loggersToClose, sysLogHandler)
+ handler = sysLogHandler
+ }
+
+ for key, value := range defaultFilters {
+ if _, exist := modeFilters[key]; !exist {
+ modeFilters[key] = value
}
-
- lm.msg = fmt.Sprintf("[%s:%d %s] %s", filepath.Base(file), line, fnName, msg)
- } else {
- lm.msg = msg
}
- } else {
- lm.msg = msg
+
+ handler = LogFilterHandler(level, modeFilters, handler)
+ handlers = append(handlers, handler)
}
- l.msg <- lm
- return nil
+
+ Root.SetHandler(log15.MultiHandler(handlers...))
}
-// StartLogger starts logger chan reading.
-func (l *Logger) StartLogger() {
- for {
- select {
- case bm := <-l.msg:
- for _, l := range l.outputs {
- if err := l.WriteMsg(bm.msg, bm.skip, bm.level); err != nil {
- fmt.Println("ERROR, unable to WriteMsg:", err)
+func LogFilterHandler(maxLevel log15.Lvl, filters map[string]log15.Lvl, h log15.Handler) log15.Handler {
+ return log15.FilterHandler(func(r *log15.Record) (pass bool) {
+
+ if len(filters) > 0 {
+ for i := 0; i < len(r.Ctx); i += 2 {
+ key := r.Ctx[i].(string)
+ if key == "logger" {
+ loggerName, strOk := r.Ctx[i+1].(string)
+ if strOk {
+ if filterLevel, ok := filters[loggerName]; ok {
+ return r.Lvl <= filterLevel
+ }
+ }
}
}
- case <-l.quit:
- return
}
- }
+
+ return r.Lvl <= maxLevel
+ }, h)
}
-// Flush flushs all chan data.
-func (l *Logger) Flush() {
- for _, l := range l.outputs {
- l.Flush()
- }
-}
-
-// Close closes logger, flush all chan data and destroy all adapter instances.
-func (l *Logger) Close() {
- l.quit <- true
- for {
- if len(l.msg) > 0 {
- bm := <-l.msg
- for _, l := range l.outputs {
- if err := l.WriteMsg(bm.msg, bm.skip, bm.level); err != nil {
- fmt.Println("ERROR, unable to WriteMsg:", err)
- }
- }
- } else {
- break
- }
- }
- for _, l := range l.outputs {
- l.Flush()
- l.Destroy()
- }
-}
-
-func (l *Logger) Trace(format string, v ...interface{}) {
- if l.level > TRACE {
- return
- }
- msg := fmt.Sprintf("[T] "+format, v...)
- l.writerMsg(0, TRACE, msg)
-}
-
-func (l *Logger) Debug(format string, v ...interface{}) {
- if l.level > DEBUG {
- return
- }
- msg := fmt.Sprintf("[D] "+format, v...)
- l.writerMsg(0, DEBUG, msg)
-}
-
-func (l *Logger) Info(format string, v ...interface{}) {
- if l.level > INFO {
- return
- }
- msg := fmt.Sprintf("[I] "+format, v...)
- l.writerMsg(0, INFO, msg)
-}
-
-func (l *Logger) Warn(format string, v ...interface{}) {
- if l.level > WARN {
- return
- }
- msg := fmt.Sprintf("[W] "+format, v...)
- l.writerMsg(0, WARN, msg)
-}
-
-func (l *Logger) Error(skip int, format string, v ...interface{}) {
- if l.level > ERROR {
- return
- }
- msg := fmt.Sprintf("[E] "+format, v...)
- l.writerMsg(skip, ERROR, msg)
-}
-
-func (l *Logger) Critical(skip int, format string, v ...interface{}) {
- if l.level > CRITICAL {
- return
- }
- msg := fmt.Sprintf("[C] "+format, v...)
- l.writerMsg(skip, CRITICAL, msg)
-}
-
-func (l *Logger) Fatal(skip int, format string, v ...interface{}) {
- if l.level > FATAL {
- return
- }
- msg := fmt.Sprintf("[F] "+format, v...)
- l.writerMsg(skip, FATAL, msg)
- l.Close()
- os.Exit(1)
+func Stack(skip int) string {
+ call := stack.Caller(skip)
+ s := stack.Trace().TrimBelow(call).TrimRuntime()
+ return s.String()
}
diff --git a/pkg/log/syslog.go b/pkg/log/syslog.go
index 7aa58129b5b..2132690cae6 100644
--- a/pkg/log/syslog.go
+++ b/pkg/log/syslog.go
@@ -3,28 +3,43 @@
package log
import (
- "encoding/json"
"errors"
"log/syslog"
+ "os"
+
+ "github.com/inconshreveable/log15"
+ "gopkg.in/ini.v1"
)
-type SyslogWriter struct {
+type SysLogHandler struct {
syslog *syslog.Writer
- Network string `json:"network"`
- Address string `json:"address"`
- Facility string `json:"facility"`
- Tag string `json:"tag"`
+ Network string
+ Address string
+ Facility string
+ Tag string
+ Format log15.Format
}
-func NewSyslog() LoggerInterface {
- return new(SyslogWriter)
-}
-
-func (sw *SyslogWriter) Init(config string) error {
- if err := json.Unmarshal([]byte(config), sw); err != nil {
- return err
+func NewSyslog(sec *ini.Section, format log15.Format) *SysLogHandler {
+ handler := &SysLogHandler{
+ Format: log15.LogfmtFormat(),
}
+ handler.Format = format
+ handler.Network = sec.Key("network").MustString("")
+ handler.Address = sec.Key("address").MustString("")
+ handler.Facility = sec.Key("facility").MustString("local7")
+ handler.Tag = sec.Key("tag").MustString("")
+
+ if err := handler.Init(); err != nil {
+ Root.Error("Failed to init syslog log handler", "error", err)
+ os.Exit(1)
+ }
+
+ return handler
+}
+
+func (sw *SysLogHandler) Init() error {
prio, err := parseFacility(sw.Facility)
if err != nil {
return err
@@ -39,22 +54,22 @@ func (sw *SyslogWriter) Init(config string) error {
return nil
}
-func (sw *SyslogWriter) WriteMsg(msg string, skip int, level LogLevel) error {
+func (sw *SysLogHandler) Log(r *log15.Record) error {
var err error
- switch level {
- case TRACE, DEBUG:
+ msg := string(sw.Format.Format(r))
+
+ switch r.Lvl {
+ case log15.LvlDebug:
err = sw.syslog.Debug(msg)
- case INFO:
+ case log15.LvlInfo:
err = sw.syslog.Info(msg)
- case WARN:
+ case log15.LvlWarn:
err = sw.syslog.Warning(msg)
- case ERROR:
+ case log15.LvlError:
err = sw.syslog.Err(msg)
- case CRITICAL:
+ case log15.LvlCrit:
err = sw.syslog.Crit(msg)
- case FATAL:
- err = sw.syslog.Alert(msg)
default:
err = errors.New("invalid syslog level")
}
@@ -62,12 +77,10 @@ func (sw *SyslogWriter) WriteMsg(msg string, skip int, level LogLevel) error {
return err
}
-func (sw *SyslogWriter) Destroy() {
+func (sw *SysLogHandler) Close() {
sw.syslog.Close()
}
-func (sw *SyslogWriter) Flush() {}
-
var facilities = map[string]syslog.Priority{
"user": syslog.LOG_USER,
"daemon": syslog.LOG_DAEMON,
@@ -89,7 +102,3 @@ func parseFacility(facility string) (syslog.Priority, error) {
return prio, nil
}
-
-func init() {
- Register("syslog", NewSyslog)
-}
diff --git a/pkg/log/syslog_windows.go b/pkg/log/syslog_windows.go
new file mode 100644
index 00000000000..9361d6c5fa5
--- /dev/null
+++ b/pkg/log/syslog_windows.go
@@ -0,0 +1,22 @@
+//+build windows
+
+package log
+
+import (
+ "github.com/inconshreveable/log15"
+ "gopkg.in/ini.v1"
+)
+
+type SysLogHandler struct {
+}
+
+func NewSyslog(sec *ini.Section, format log15.Format) *SysLogHandler {
+ return &SysLogHandler{}
+}
+
+func (sw *SysLogHandler) Log(r *log15.Record) error {
+ return nil
+}
+
+func (sw *SysLogHandler) Close() {
+}
diff --git a/pkg/login/auth.go b/pkg/login/auth.go
index f2034476f81..a71837e25bc 100644
--- a/pkg/login/auth.go
+++ b/pkg/login/auth.go
@@ -32,9 +32,9 @@ func AuthenticateUser(query *LoginUserQuery) error {
}
if setting.LdapEnabled {
- for _, server := range ldapCfg.Servers {
+ for _, server := range LdapCfg.Servers {
auther := NewLdapAuthenticator(server)
- err = auther.login(query)
+ err = auther.Login(query)
if err == nil || err != ErrInvalidCredentials {
return err
}
diff --git a/pkg/login/ldap.go b/pkg/login/ldap.go
index 48f226ccfa5..be3babac02e 100644
--- a/pkg/login/ldap.go
+++ b/pkg/login/ldap.go
@@ -13,23 +13,43 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
)
+type ILdapConn interface {
+ Bind(username, password string) error
+ Search(*ldap.SearchRequest) (*ldap.SearchResult, error)
+ StartTLS(*tls.Config) error
+ Close()
+}
+
+type ILdapAuther interface {
+ Login(query *LoginUserQuery) error
+ SyncSignedInUser(signedInUser *m.SignedInUser) error
+ GetGrafanaUserFor(ldapUser *LdapUserInfo) (*m.User, error)
+ SyncOrgRoles(user *m.User, ldapUser *LdapUserInfo) error
+}
+
type ldapAuther struct {
server *LdapServerConf
- conn *ldap.Conn
+ conn ILdapConn
requireSecondBind bool
+ log log.Logger
}
-func NewLdapAuthenticator(server *LdapServerConf) *ldapAuther {
- return &ldapAuther{server: server}
+var NewLdapAuthenticator = func(server *LdapServerConf) ILdapAuther {
+ return &ldapAuther{server: server, log: log.New("ldap")}
+}
+
+var ldapDial = func(network, addr string) (ILdapConn, error) {
+ return ldap.Dial(network, addr)
}
func (a *ldapAuther) Dial() error {
var err error
var certPool *x509.CertPool
if a.server.RootCACert != "" {
- certPool := x509.NewCertPool()
+ certPool = x509.NewCertPool()
for _, caCertFile := range strings.Split(a.server.RootCACert, " ") {
if pem, err := ioutil.ReadFile(caCertFile); err != nil {
return err
@@ -48,9 +68,18 @@ func (a *ldapAuther) Dial() error {
ServerName: host,
RootCAs: certPool,
}
- a.conn, err = ldap.DialTLS("tcp", address, tlsCfg)
+ if a.server.StartTLS {
+ a.conn, err = ldap.Dial("tcp", address)
+ if err == nil {
+ if err = a.conn.StartTLS(tlsCfg); err == nil {
+ return nil
+ }
+ }
+ } else {
+ a.conn, err = ldap.DialTLS("tcp", address, tlsCfg)
+ }
} else {
- a.conn, err = ldap.Dial("tcp", address)
+ a.conn, err = ldapDial("tcp", address)
}
if err == nil {
@@ -60,7 +89,7 @@ func (a *ldapAuther) Dial() error {
return err
}
-func (a *ldapAuther) login(query *LoginUserQuery) error {
+func (a *ldapAuther) Login(query *LoginUserQuery) error {
if err := a.Dial(); err != nil {
return err
}
@@ -75,9 +104,7 @@ func (a *ldapAuther) login(query *LoginUserQuery) error {
if ldapUser, err := a.searchForUser(query.Username); err != nil {
return err
} else {
- if ldapCfg.VerboseLogging {
- log.Info("Ldap User Info: %s", spew.Sdump(ldapUser))
- }
+ a.log.Debug("Ldap User found", "info", spew.Sdump(ldapUser))
// check if a second user bind is needed
if a.requireSecondBind {
@@ -86,16 +113,11 @@ func (a *ldapAuther) login(query *LoginUserQuery) error {
}
}
- if grafanaUser, err := a.getGrafanaUserFor(ldapUser); err != nil {
+ if grafanaUser, err := a.GetGrafanaUserFor(ldapUser); err != nil {
return err
} else {
- // sync user details
- if err := a.syncUserInfo(grafanaUser, ldapUser); err != nil {
- return err
- }
- // sync org roles
- if err := a.syncOrgRoles(grafanaUser, ldapUser); err != nil {
- return err
+ if syncErr := a.syncInfoAndOrgRoles(grafanaUser, ldapUser); syncErr != nil {
+ return syncErr
}
query.User = grafanaUser
return nil
@@ -103,7 +125,53 @@ func (a *ldapAuther) login(query *LoginUserQuery) error {
}
}
-func (a *ldapAuther) getGrafanaUserFor(ldapUser *ldapUserInfo) (*m.User, error) {
+func (a *ldapAuther) SyncSignedInUser(signedInUser *m.SignedInUser) error {
+ grafanaUser := m.User{
+ Id: signedInUser.UserId,
+ Login: signedInUser.Login,
+ Email: signedInUser.Email,
+ Name: signedInUser.Name,
+ }
+
+ if err := a.Dial(); err != nil {
+ return err
+ }
+
+ defer a.conn.Close()
+ if err := a.serverBind(); err != nil {
+ return err
+ }
+
+ if ldapUser, err := a.searchForUser(signedInUser.Login); err != nil {
+ a.log.Error("Failed searching for user in ldap", "error", err)
+
+ return err
+ } else {
+ if err := a.syncInfoAndOrgRoles(&grafanaUser, ldapUser); err != nil {
+ return err
+ }
+
+ a.log.Debug("Got Ldap User Info", "user", spew.Sdump(ldapUser))
+ }
+
+ return nil
+}
+
+// Sync info for ldap user and grafana user
+func (a *ldapAuther) syncInfoAndOrgRoles(user *m.User, ldapUser *LdapUserInfo) error {
+ // sync user details
+ if err := a.syncUserInfo(user, ldapUser); err != nil {
+ return err
+ }
+ // sync org roles
+ if err := a.SyncOrgRoles(user, ldapUser); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (a *ldapAuther) GetGrafanaUserFor(ldapUser *LdapUserInfo) (*m.User, error) {
// validate that the user has access
// if there are no ldap group mappings access is true
// otherwise a single group must match
@@ -116,15 +184,18 @@ func (a *ldapAuther) getGrafanaUserFor(ldapUser *ldapUserInfo) (*m.User, error)
}
if !access {
- log.Info("Ldap Auth: user %s does not belong in any of the specified ldap groups, ldapUser groups: %v", ldapUser.Username, ldapUser.MemberOf)
+ a.log.Info("Ldap Auth: user does not belong in any of the specified ldap groups", "username", ldapUser.Username, "groups", ldapUser.MemberOf)
return nil, ErrInvalidCredentials
}
// get user from grafana db
userQuery := m.GetUserByLoginQuery{LoginOrEmail: ldapUser.Username}
if err := bus.Dispatch(&userQuery); err != nil {
- if err == m.ErrUserNotFound {
+ if err == m.ErrUserNotFound && setting.LdapAllowSignup {
return a.createGrafanaUser(ldapUser)
+ } else if err == m.ErrUserNotFound {
+ a.log.Warn("Not allowing LDAP login, user not found in internal user database, and ldap allow signup = false")
+ return nil, ErrInvalidCredentials
} else {
return nil, err
}
@@ -133,7 +204,7 @@ func (a *ldapAuther) getGrafanaUserFor(ldapUser *ldapUserInfo) (*m.User, error)
return userQuery.Result, nil
}
-func (a *ldapAuther) createGrafanaUser(ldapUser *ldapUserInfo) (*m.User, error) {
+func (a *ldapAuther) createGrafanaUser(ldapUser *LdapUserInfo) (*m.User, error) {
cmd := m.CreateUserCommand{
Login: ldapUser.Username,
Email: ldapUser.Email,
@@ -147,13 +218,13 @@ func (a *ldapAuther) createGrafanaUser(ldapUser *ldapUserInfo) (*m.User, error)
return &cmd.Result, nil
}
-func (a *ldapAuther) syncUserInfo(user *m.User, ldapUser *ldapUserInfo) error {
+func (a *ldapAuther) syncUserInfo(user *m.User, ldapUser *LdapUserInfo) error {
var name = fmt.Sprintf("%s %s", ldapUser.FirstName, ldapUser.LastName)
if user.Email == ldapUser.Email && user.Name == name {
return nil
}
- log.Info("Ldap: Syncing user info %s", ldapUser.Username)
+ a.log.Debug("Syncing user info", "username", ldapUser.Username)
updateCmd := m.UpdateUserCommand{}
updateCmd.UserId = user.Id
updateCmd.Login = user.Login
@@ -162,8 +233,9 @@ func (a *ldapAuther) syncUserInfo(user *m.User, ldapUser *ldapUserInfo) error {
return bus.Dispatch(&updateCmd)
}
-func (a *ldapAuther) syncOrgRoles(user *m.User, ldapUser *ldapUserInfo) error {
+func (a *ldapAuther) SyncOrgRoles(user *m.User, ldapUser *LdapUserInfo) error {
if len(a.server.LdapGroups) == 0 {
+ a.log.Warn("No group mappings defined")
return nil
}
@@ -219,7 +291,8 @@ func (a *ldapAuther) syncOrgRoles(user *m.User, ldapUser *ldapUserInfo) error {
// add role
cmd := m.AddOrgUserCommand{UserId: user.Id, Role: group.OrgRole, OrgId: group.OrgId}
- if err := bus.Dispatch(&cmd); err != nil {
+ err := bus.Dispatch(&cmd)
+ if err != nil && err != m.ErrOrgNotFound {
return err
}
@@ -230,11 +303,25 @@ func (a *ldapAuther) syncOrgRoles(user *m.User, ldapUser *ldapUserInfo) error {
return nil
}
-func (a *ldapAuther) secondBind(ldapUser *ldapUserInfo, userPassword string) error {
- if err := a.conn.Bind(ldapUser.DN, userPassword); err != nil {
- if ldapCfg.VerboseLogging {
- log.Info("LDAP second bind failed, %v", err)
+func (a *ldapAuther) serverBind() error {
+ // bind_dn and bind_password to bind
+ if err := a.conn.Bind(a.server.BindDN, a.server.BindPassword); err != nil {
+ a.log.Info("LDAP initial bind failed, %v", err)
+
+ if ldapErr, ok := err.(*ldap.Error); ok {
+ if ldapErr.ResultCode == 49 {
+ return ErrInvalidCredentials
+ }
}
+ return err
+ }
+
+ return nil
+}
+
+func (a *ldapAuther) secondBind(ldapUser *LdapUserInfo, userPassword string) error {
+ if err := a.conn.Bind(ldapUser.DN, userPassword); err != nil {
+ a.log.Info("Second bind failed", "error", err)
if ldapErr, ok := err.(*ldap.Error); ok {
if ldapErr.ResultCode == 49 {
@@ -259,9 +346,7 @@ func (a *ldapAuther) initialBind(username, userPassword string) error {
}
if err := a.conn.Bind(bindPath, userPassword); err != nil {
- if ldapCfg.VerboseLogging {
- log.Info("LDAP initial bind failed, %v", err)
- }
+ a.log.Info("Initial bind failed", "error", err)
if ldapErr, ok := err.(*ldap.Error); ok {
if ldapErr.ResultCode == 49 {
@@ -274,7 +359,7 @@ func (a *ldapAuther) initialBind(username, userPassword string) error {
return nil
}
-func (a *ldapAuther) searchForUser(username string) (*ldapUserInfo, error) {
+func (a *ldapAuther) searchForUser(username string) (*LdapUserInfo, error) {
var searchResult *ldap.SearchResult
var err error
@@ -290,7 +375,7 @@ func (a *ldapAuther) searchForUser(username string) (*ldapUserInfo, error) {
a.server.Attr.Name,
a.server.Attr.MemberOf,
},
- Filter: strings.Replace(a.server.SearchFilter, "%s", username, -1),
+ Filter: strings.Replace(a.server.SearchFilter, "%s", ldap.EscapeFilter(username), -1),
}
searchResult, err = a.conn.Search(&searchReq)
@@ -323,11 +408,9 @@ func (a *ldapAuther) searchForUser(username string) (*ldapUserInfo, error) {
if a.server.GroupSearchFilterUserAttribute == "" {
filter_replace = getLdapAttr(a.server.Attr.Username, searchResult)
}
- filter := strings.Replace(a.server.GroupSearchFilter, "%s", filter_replace, -1)
+ filter := strings.Replace(a.server.GroupSearchFilter, "%s", ldap.EscapeFilter(filter_replace), -1)
- if ldapCfg.VerboseLogging {
- log.Info("LDAP: Searching for user's groups: %s", filter)
- }
+ a.log.Info("Searching for user's groups", "filter", filter)
groupSearchReq := ldap.SearchRequest{
BaseDN: groupSearchBase,
@@ -354,7 +437,7 @@ func (a *ldapAuther) searchForUser(username string) (*ldapUserInfo, error) {
}
}
- return &ldapUserInfo{
+ return &LdapUserInfo{
DN: searchResult.Entries[0].DN,
LastName: getLdapAttr(a.server.Attr.Surname, searchResult),
FirstName: getLdapAttr(a.server.Attr.Name, searchResult),
diff --git a/pkg/login/ldap_test.go b/pkg/login/ldap_test.go
index 2e4ed3a32e1..8677bbeae42 100644
--- a/pkg/login/ldap_test.go
+++ b/pkg/login/ldap_test.go
@@ -1,8 +1,10 @@
package login
import (
+ "crypto/tls"
"testing"
+ "github.com/go-ldap/ldap"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
. "github.com/smartystreets/goconvey/convey"
@@ -16,7 +18,7 @@ func TestLdapAuther(t *testing.T) {
ldapAuther := NewLdapAuthenticator(&LdapServerConf{
LdapGroups: []*LdapGroupToOrgRole{{}},
})
- _, err := ldapAuther.getGrafanaUserFor(&ldapUserInfo{})
+ _, err := ldapAuther.GetGrafanaUserFor(&LdapUserInfo{})
So(err, ShouldEqual, ErrInvalidCredentials)
})
@@ -32,7 +34,7 @@ func TestLdapAuther(t *testing.T) {
sc.userQueryReturns(user1)
- result, err := ldapAuther.getGrafanaUserFor(&ldapUserInfo{})
+ result, err := ldapAuther.GetGrafanaUserFor(&LdapUserInfo{})
So(err, ShouldBeNil)
So(result, ShouldEqual, user1)
})
@@ -46,7 +48,7 @@ func TestLdapAuther(t *testing.T) {
sc.userQueryReturns(user1)
- result, err := ldapAuther.getGrafanaUserFor(&ldapUserInfo{MemberOf: []string{"cn=users"}})
+ result, err := ldapAuther.GetGrafanaUserFor(&LdapUserInfo{MemberOf: []string{"cn=users"}})
So(err, ShouldBeNil)
So(result, ShouldEqual, user1)
})
@@ -62,7 +64,7 @@ func TestLdapAuther(t *testing.T) {
sc.userQueryReturns(nil)
- result, err := ldapAuther.getGrafanaUserFor(&ldapUserInfo{
+ result, err := ldapAuther.GetGrafanaUserFor(&LdapUserInfo{
Username: "torkelo",
Email: "my@email.com",
MemberOf: []string{"cn=editor"},
@@ -93,7 +95,7 @@ func TestLdapAuther(t *testing.T) {
})
sc.userOrgsQueryReturns([]*m.UserOrgDTO{})
- err := ldapAuther.syncOrgRoles(&m.User{}, &ldapUserInfo{
+ err := ldapAuther.SyncOrgRoles(&m.User{}, &LdapUserInfo{
MemberOf: []string{"cn=users"},
})
@@ -112,7 +114,7 @@ func TestLdapAuther(t *testing.T) {
})
sc.userOrgsQueryReturns([]*m.UserOrgDTO{{OrgId: 1, Role: m.ROLE_EDITOR}})
- err := ldapAuther.syncOrgRoles(&m.User{}, &ldapUserInfo{
+ err := ldapAuther.SyncOrgRoles(&m.User{}, &LdapUserInfo{
MemberOf: []string{"cn=users"},
})
@@ -131,7 +133,7 @@ func TestLdapAuther(t *testing.T) {
})
sc.userOrgsQueryReturns([]*m.UserOrgDTO{{OrgId: 1, Role: m.ROLE_EDITOR}})
- err := ldapAuther.syncOrgRoles(&m.User{}, &ldapUserInfo{
+ err := ldapAuther.SyncOrgRoles(&m.User{}, &LdapUserInfo{
MemberOf: []string{"cn=other"},
})
@@ -150,7 +152,7 @@ func TestLdapAuther(t *testing.T) {
})
sc.userOrgsQueryReturns([]*m.UserOrgDTO{{OrgId: 1, Role: m.ROLE_EDITOR}})
- err := ldapAuther.syncOrgRoles(&m.User{}, &ldapUserInfo{
+ err := ldapAuther.SyncOrgRoles(&m.User{}, &LdapUserInfo{
MemberOf: []string{"cn=users"},
})
@@ -170,7 +172,7 @@ func TestLdapAuther(t *testing.T) {
})
sc.userOrgsQueryReturns([]*m.UserOrgDTO{{OrgId: 1, Role: m.ROLE_ADMIN}})
- err := ldapAuther.syncOrgRoles(&m.User{}, &ldapUserInfo{
+ err := ldapAuther.SyncOrgRoles(&m.User{}, &LdapUserInfo{
MemberOf: []string{"cn=admins"},
})
@@ -189,7 +191,7 @@ func TestLdapAuther(t *testing.T) {
})
sc.userOrgsQueryReturns([]*m.UserOrgDTO{})
- err := ldapAuther.syncOrgRoles(&m.User{}, &ldapUserInfo{
+ err := ldapAuther.SyncOrgRoles(&m.User{}, &LdapUserInfo{
MemberOf: []string{"cn=admins"},
})
@@ -200,6 +202,95 @@ func TestLdapAuther(t *testing.T) {
})
})
+
+ Convey("When calling SyncSignedInUser", t, func() {
+
+ mockLdapConnection := &mockLdapConn{}
+ ldapAuther := NewLdapAuthenticator(
+ &LdapServerConf{
+ Host: "",
+ RootCACert: "",
+ LdapGroups: []*LdapGroupToOrgRole{
+ {GroupDN: "*", OrgRole: "Admin"},
+ },
+ Attr: LdapAttributeMap{
+ Username: "username",
+ Surname: "surname",
+ Email: "email",
+ Name: "name",
+ MemberOf: "memberof",
+ },
+ SearchBaseDNs: []string{"BaseDNHere"},
+ },
+ )
+
+ dialCalled := false
+ ldapDial = func(network, addr string) (ILdapConn, error) {
+ dialCalled = true
+ return mockLdapConnection, nil
+ }
+
+ entry := ldap.Entry{
+ DN: "dn", Attributes: []*ldap.EntryAttribute{
+ {Name: "username", Values: []string{"roelgerrits"}},
+ {Name: "surname", Values: []string{"Gerrits"}},
+ {Name: "email", Values: []string{"roel@test.com"}},
+ {Name: "name", Values: []string{"Roel"}},
+ {Name: "memberof", Values: []string{"admins"}},
+ }}
+ result := ldap.SearchResult{Entries: []*ldap.Entry{&entry}}
+ mockLdapConnection.setSearchResult(&result)
+
+ ldapAutherScenario("When ldapUser found call syncInfo and orgRoles", func(sc *scenarioContext) {
+ // arrange
+ signedInUser := &m.SignedInUser{
+ Email: "roel@test.net",
+ UserId: 1,
+ Name: "Roel Gerrits",
+ Login: "roelgerrits",
+ }
+
+ sc.userOrgsQueryReturns([]*m.UserOrgDTO{})
+
+ // act
+ syncErrResult := ldapAuther.SyncSignedInUser(signedInUser)
+
+ // assert
+ So(dialCalled, ShouldBeTrue)
+ So(syncErrResult, ShouldBeNil)
+ // User should be searched in ldap
+ So(mockLdapConnection.searchCalled, ShouldBeTrue)
+ // Info should be updated (email differs)
+ So(sc.updateUserCmd.Email, ShouldEqual, "roel@test.com")
+ // User should have admin privileges
+ So(sc.addOrgUserCmd.UserId, ShouldEqual, 1)
+ So(sc.addOrgUserCmd.Role, ShouldEqual, "Admin")
+ })
+ })
+}
+
+type mockLdapConn struct {
+ result *ldap.SearchResult
+ searchCalled bool
+}
+
+func (c *mockLdapConn) Bind(username, password string) error {
+ return nil
+}
+
+func (c *mockLdapConn) Close() {}
+
+func (c *mockLdapConn) setSearchResult(result *ldap.SearchResult) {
+ c.result = result
+}
+
+func (c *mockLdapConn) Search(*ldap.SearchRequest) (*ldap.SearchResult, error) {
+ c.searchCalled = true
+ return c.result, nil
+}
+
+func (c *mockLdapConn) StartTLS(*tls.Config) error {
+ return nil
}
func ldapAutherScenario(desc string, fn scenarioFunc) {
@@ -229,6 +320,11 @@ func ldapAutherScenario(desc string, fn scenarioFunc) {
return nil
})
+ bus.AddHandler("test", func(cmd *m.UpdateUserCommand) error {
+ sc.updateUserCmd = cmd
+ return nil
+ })
+
fn(sc)
})
}
@@ -238,6 +334,7 @@ type scenarioContext struct {
addOrgUserCmd *m.AddOrgUserCommand
updateOrgUserCmd *m.UpdateOrgUserCommand
removeOrgUserCmd *m.RemoveOrgUserCommand
+ updateUserCmd *m.UpdateUserCommand
}
func (sc *scenarioContext) userQueryReturns(user *m.User) {
diff --git a/pkg/login/ldap_user.go b/pkg/login/ldap_user.go
index 5a57efe2687..9f1cf3c96b6 100644
--- a/pkg/login/ldap_user.go
+++ b/pkg/login/ldap_user.go
@@ -1,6 +1,6 @@
package login
-type ldapUserInfo struct {
+type LdapUserInfo struct {
DN string
FirstName string
LastName string
@@ -9,7 +9,7 @@ type ldapUserInfo struct {
MemberOf []string
}
-func (u *ldapUserInfo) isMemberOf(group string) bool {
+func (u *LdapUserInfo) isMemberOf(group string) bool {
if group == "*" {
return true
}
diff --git a/pkg/login/settings.go b/pkg/login/settings.go
index a42476157fe..497d8725e29 100644
--- a/pkg/login/settings.go
+++ b/pkg/login/settings.go
@@ -2,6 +2,7 @@ package login
import (
"fmt"
+ "os"
"github.com/BurntSushi/toml"
"github.com/grafana/grafana/pkg/log"
@@ -10,14 +11,14 @@ import (
)
type LdapConfig struct {
- Servers []*LdapServerConf `toml:"servers"`
- VerboseLogging bool `toml:"verbose_logging"`
+ Servers []*LdapServerConf `toml:"servers"`
}
type LdapServerConf struct {
Host string `toml:"host"`
Port int `toml:"port"`
UseSSL bool `toml:"use_ssl"`
+ StartTLS bool `toml:"start_tls"`
SkipVerifySSL bool `toml:"ssl_skip_verify"`
RootCACert string `toml:"root_ca_cert"`
BindDN string `toml:"bind_dn"`
@@ -48,26 +49,29 @@ type LdapGroupToOrgRole struct {
OrgRole m.RoleType `toml:"org_role"`
}
-var ldapCfg LdapConfig
+var LdapCfg LdapConfig
+var ldapLogger log.Logger = log.New("ldap")
func loadLdapConfig() {
if !setting.LdapEnabled {
return
}
- log.Info("Login: Ldap enabled, reading config file: %s", setting.LdapConfigFile)
+ ldapLogger.Info("Ldap enabled, reading config file", "file", setting.LdapConfigFile)
- _, err := toml.DecodeFile(setting.LdapConfigFile, &ldapCfg)
+ _, err := toml.DecodeFile(setting.LdapConfigFile, &LdapCfg)
if err != nil {
- log.Fatal(3, "Failed to load ldap config file: %s", err)
+ ldapLogger.Crit("Failed to load ldap config file", "error", err)
+ os.Exit(1)
}
- if len(ldapCfg.Servers) == 0 {
- log.Fatal(3, "ldap enabled but no ldap servers defined in config file: %s", setting.LdapConfigFile)
+ if len(LdapCfg.Servers) == 0 {
+ ldapLogger.Crit("ldap enabled but no ldap servers defined in config file")
+ os.Exit(1)
}
// set default org id
- for _, server := range ldapCfg.Servers {
+ for _, server := range LdapCfg.Servers {
assertNotEmptyCfg(server.SearchFilter, "search_filter")
assertNotEmptyCfg(server.SearchBaseDNs, "search_base_dns")
@@ -83,11 +87,13 @@ func assertNotEmptyCfg(val interface{}, propName string) {
switch v := val.(type) {
case string:
if v == "" {
- log.Fatal(3, "LDAP config file is missing option: %s", propName)
+ ldapLogger.Crit("LDAP config file is missing option", "option", propName)
+ os.Exit(1)
}
case []string:
if len(v) == 0 {
- log.Fatal(3, "LDAP config file is missing option: %s", propName)
+ ldapLogger.Crit("LDAP config file is missing option", "option", propName)
+ os.Exit(1)
}
default:
fmt.Println("unknown")
diff --git a/pkg/metrics/EMWA.go b/pkg/metrics/EMWA.go
new file mode 100644
index 00000000000..d99dc77b016
--- /dev/null
+++ b/pkg/metrics/EMWA.go
@@ -0,0 +1,122 @@
+// includes code from
+// https://raw.githubusercontent.com/rcrowley/go-metrics/master/sample.go
+// Copyright 2012 Richard Crowley. All rights reserved.
+
+package metrics
+
+import (
+ "math"
+ "sync"
+ "sync/atomic"
+)
+
+// EWMAs continuously calculate an exponentially-weighted moving average
+// based on an outside source of clock ticks.
+type EWMA interface {
+ Rate() float64
+ Snapshot() EWMA
+ Tick()
+ Update(int64)
+}
+
+// NewEWMA constructs a new EWMA with the given alpha.
+func NewEWMA(alpha float64) EWMA {
+ if UseNilMetrics {
+ return NilEWMA{}
+ }
+ return &StandardEWMA{alpha: alpha}
+}
+
+// NewEWMA1 constructs a new EWMA for a one-minute moving average.
+func NewEWMA1() EWMA {
+ return NewEWMA(1 - math.Exp(-5.0/60.0/1))
+}
+
+// NewEWMA5 constructs a new EWMA for a five-minute moving average.
+func NewEWMA5() EWMA {
+ return NewEWMA(1 - math.Exp(-5.0/60.0/5))
+}
+
+// NewEWMA15 constructs a new EWMA for a fifteen-minute moving average.
+func NewEWMA15() EWMA {
+ return NewEWMA(1 - math.Exp(-5.0/60.0/15))
+}
+
+// EWMASnapshot is a read-only copy of another EWMA.
+type EWMASnapshot float64
+
+// Rate returns the rate of events per second at the time the snapshot was
+// taken.
+func (a EWMASnapshot) Rate() float64 { return float64(a) }
+
+// Snapshot returns the snapshot.
+func (a EWMASnapshot) Snapshot() EWMA { return a }
+
+// Tick panics.
+func (EWMASnapshot) Tick() {
+ panic("Tick called on an EWMASnapshot")
+}
+
+// Update panics.
+func (EWMASnapshot) Update(int64) {
+ panic("Update called on an EWMASnapshot")
+}
+
+// NilEWMA is a no-op EWMA.
+type NilEWMA struct{}
+
+// Rate is a no-op.
+func (NilEWMA) Rate() float64 { return 0.0 }
+
+// Snapshot is a no-op.
+func (NilEWMA) Snapshot() EWMA { return NilEWMA{} }
+
+// Tick is a no-op.
+func (NilEWMA) Tick() {}
+
+// Update is a no-op.
+func (NilEWMA) Update(n int64) {}
+
+// StandardEWMA is the standard implementation of an EWMA and tracks the number
+// of uncounted events and processes them on each tick. It uses the
+// sync/atomic package to manage uncounted events.
+type StandardEWMA struct {
+ uncounted int64 // /!\ this should be the first member to ensure 64-bit alignment
+ alpha float64
+ rate float64
+ init bool
+ mutex sync.Mutex
+}
+
+// Rate returns the moving average rate of events per second.
+func (a *StandardEWMA) Rate() float64 {
+ a.mutex.Lock()
+ defer a.mutex.Unlock()
+ return a.rate * float64(1e9)
+}
+
+// Snapshot returns a read-only copy of the EWMA.
+func (a *StandardEWMA) Snapshot() EWMA {
+ return EWMASnapshot(a.Rate())
+}
+
+// Tick ticks the clock to update the moving average. It assumes it is called
+// every five seconds.
+func (a *StandardEWMA) Tick() {
+ count := atomic.LoadInt64(&a.uncounted)
+ atomic.AddInt64(&a.uncounted, -count)
+ instantRate := float64(count) / float64(5e9)
+ a.mutex.Lock()
+ defer a.mutex.Unlock()
+ if a.init {
+ a.rate += a.alpha * (instantRate - a.rate)
+ } else {
+ a.init = true
+ a.rate = instantRate
+ }
+}
+
+// Update adds n uncounted events.
+func (a *StandardEWMA) Update(n int64) {
+ atomic.AddInt64(&a.uncounted, n)
+}
diff --git a/pkg/metrics/combos.go b/pkg/metrics/combos.go
new file mode 100644
index 00000000000..b4da59c5b32
--- /dev/null
+++ b/pkg/metrics/combos.go
@@ -0,0 +1,46 @@
+package metrics
+
+// type comboCounterRef struct {
+// *MetricMeta
+// usageCounter Counter
+// metricCounter Counter
+// }
+//
+// func RegComboCounter(name string, tagStrings ...string) Counter {
+// meta := NewMetricMeta(name, tagStrings)
+// cr := &comboCounterRef{
+// MetricMeta: meta,
+// usageCounter: NewCounter(meta),
+// metricCounter: NewCounter(meta),
+// }
+//
+// UsageStats.Register(cr.usageCounter)
+// MetricStats.Register(cr.metricCounter)
+//
+// return cr
+// }
+//
+// func (c comboCounterRef) Clear() {
+// c.usageCounter.Clear()
+// c.metricCounter.Clear()
+// }
+//
+// func (c comboCounterRef) Count() int64 {
+// panic("Count called on a combocounter ref")
+// }
+//
+// // Dec panics.
+// func (c comboCounterRef) Dec(i int64) {
+// c.usageCounter.Dec(i)
+// c.metricCounter.Dec(i)
+// }
+//
+// // Inc panics.
+// func (c comboCounterRef) Inc(i int64) {
+// c.usageCounter.Inc(i)
+// c.metricCounter.Inc(i)
+// }
+//
+// func (c comboCounterRef) Snapshot() Metric {
+// return c.metricCounter.Snapshot()
+// }
diff --git a/pkg/metrics/common.go b/pkg/metrics/common.go
new file mode 100644
index 00000000000..2043d3a67cf
--- /dev/null
+++ b/pkg/metrics/common.go
@@ -0,0 +1,61 @@
+package metrics
+
+import "github.com/grafana/grafana/pkg/log"
+
+type MetricMeta struct {
+ tags map[string]string
+ name string
+}
+
+func NewMetricMeta(name string, tagStrings []string) *MetricMeta {
+ if len(tagStrings)%2 != 0 {
+ log.Fatal(3, "Metrics: tags array is missing value for key, %v", tagStrings)
+ }
+
+ tags := make(map[string]string)
+ for i := 0; i < len(tagStrings); i += 2 {
+ tags[tagStrings[i]] = tagStrings[i+1]
+ }
+
+ return &MetricMeta{
+ tags: tags,
+ name: name,
+ }
+}
+
+func (m *MetricMeta) Name() string {
+ return m.name
+}
+
+func (m *MetricMeta) GetTagsCopy() map[string]string {
+ if len(m.tags) == 0 {
+ return make(map[string]string)
+ }
+
+ copy := make(map[string]string)
+ for k2, v2 := range m.tags {
+ copy[k2] = v2
+ }
+
+ return copy
+}
+
+func (m *MetricMeta) StringifyTags() string {
+ if len(m.tags) == 0 {
+ return ""
+ }
+
+ str := ""
+ for key, value := range m.tags {
+ str += "." + key + "_" + value
+ }
+
+ return str
+}
+
+type Metric interface {
+ Name() string
+ GetTagsCopy() map[string]string
+ StringifyTags() string
+ Snapshot() Metric
+}
diff --git a/pkg/metrics/counter.go b/pkg/metrics/counter.go
index 1a4a88be37b..8322d370a36 100644
--- a/pkg/metrics/counter.go
+++ b/pkg/metrics/counter.go
@@ -4,46 +4,33 @@ import "sync/atomic"
// Counters hold an int64 value that can be incremented and decremented.
type Counter interface {
+ Metric
+
Clear()
Count() int64
Dec(int64)
Inc(int64)
- Snapshot() Counter
}
// NewCounter constructs a new StandardCounter.
-func NewCounter() Counter {
- return &StandardCounter{0}
+func NewCounter(meta *MetricMeta) Counter {
+ return &StandardCounter{
+ MetricMeta: meta,
+ count: 0,
+ }
}
-// CounterSnapshot is a read-only copy of another Counter.
-type CounterSnapshot int64
-
-// Clear panics.
-func (CounterSnapshot) Clear() {
- panic("Clear called on a CounterSnapshot")
+func RegCounter(name string, tagStrings ...string) Counter {
+ cr := NewCounter(NewMetricMeta(name, tagStrings))
+ MetricStats.Register(cr)
+ return cr
}
-// Count returns the count at the time the snapshot was taken.
-func (c CounterSnapshot) Count() int64 { return int64(c) }
-
-// Dec panics.
-func (CounterSnapshot) Dec(int64) {
- panic("Dec called on a CounterSnapshot")
-}
-
-// Inc panics.
-func (CounterSnapshot) Inc(int64) {
- panic("Inc called on a CounterSnapshot")
-}
-
-// Snapshot returns the snapshot.
-func (c CounterSnapshot) Snapshot() Counter { return c }
-
// StandardCounter is the standard implementation of a Counter and uses the
// sync/atomic package to manage a single int64 value.
type StandardCounter struct {
- count int64
+ count int64 //Due to a bug in golang the 64bit variable need to come first to be 64bit aligned. https://golang.org/pkg/sync/atomic/#pkg-note-BUG
+ *MetricMeta
}
// Clear sets the counter to zero.
@@ -66,7 +53,9 @@ func (c *StandardCounter) Inc(i int64) {
atomic.AddInt64(&c.count, i)
}
-// Snapshot returns a read-only copy of the counter.
-func (c *StandardCounter) Snapshot() Counter {
- return CounterSnapshot(c.Count())
+func (c *StandardCounter) Snapshot() Metric {
+ return &StandardCounter{
+ MetricMeta: c.MetricMeta,
+ count: c.count,
+ }
}
diff --git a/pkg/metrics/delta.go b/pkg/metrics/delta.go
new file mode 100644
index 00000000000..71354178209
--- /dev/null
+++ b/pkg/metrics/delta.go
@@ -0,0 +1,11 @@
+package metrics
+
+import "math"
+
+func calculateDelta(oldValue, newValue int64) int64 {
+ if oldValue < newValue {
+ return newValue - oldValue
+ } else {
+ return (math.MaxInt64 - oldValue) + (newValue - math.MinInt64) + 1
+ }
+}
diff --git a/pkg/metrics/gauge.go b/pkg/metrics/gauge.go
new file mode 100644
index 00000000000..cca32da5622
--- /dev/null
+++ b/pkg/metrics/gauge.go
@@ -0,0 +1,83 @@
+// includes code from
+// https://raw.githubusercontent.com/rcrowley/go-metrics/master/sample.go
+// Copyright 2012 Richard Crowley. All rights reserved.
+
+package metrics
+
+import "sync/atomic"
+
+// Gauges hold an int64 value that can be set arbitrarily.
+type Gauge interface {
+ Metric
+
+ Update(int64)
+ Value() int64
+}
+
+func NewGauge(meta *MetricMeta) Gauge {
+ if UseNilMetrics {
+ return NilGauge{}
+ }
+ return &StandardGauge{
+ MetricMeta: meta,
+ value: 0,
+ }
+}
+
+func RegGauge(name string, tagStrings ...string) Gauge {
+ tr := NewGauge(NewMetricMeta(name, tagStrings))
+ MetricStats.Register(tr)
+ return tr
+}
+
+// GaugeSnapshot is a read-only copy of another Gauge.
+type GaugeSnapshot struct {
+ value int64
+ *MetricMeta
+}
+
+// Snapshot returns the snapshot.
+func (g GaugeSnapshot) Snapshot() Metric { return g }
+
+// Update panics.
+func (GaugeSnapshot) Update(int64) {
+ panic("Update called on a GaugeSnapshot")
+}
+
+// Value returns the value at the time the snapshot was taken.
+func (g GaugeSnapshot) Value() int64 { return g.value }
+
+// NilGauge is a no-op Gauge.
+type NilGauge struct{ *MetricMeta }
+
+// Snapshot is a no-op.
+func (NilGauge) Snapshot() Metric { return NilGauge{} }
+
+// Update is a no-op.
+func (NilGauge) Update(v int64) {}
+
+// Value is a no-op.
+func (NilGauge) Value() int64 { return 0 }
+
+// StandardGauge is the standard implementation of a Gauge and uses the
+// sync/atomic package to manage a single int64 value.
+// atomic needs 64-bit aligned memory which is ensure for first word
+type StandardGauge struct {
+ value int64
+ *MetricMeta
+}
+
+// Snapshot returns a read-only copy of the gauge.
+func (g *StandardGauge) Snapshot() Metric {
+ return GaugeSnapshot{MetricMeta: g.MetricMeta, value: g.value}
+}
+
+// Update updates the gauge's value.
+func (g *StandardGauge) Update(v int64) {
+ atomic.StoreInt64(&g.value, v)
+}
+
+// Value returns the gauge's current value.
+func (g *StandardGauge) Value() int64 {
+ return atomic.LoadInt64(&g.value)
+}
diff --git a/pkg/metrics/graphite.go b/pkg/metrics/graphite.go
new file mode 100644
index 00000000000..59c992776de
--- /dev/null
+++ b/pkg/metrics/graphite.go
@@ -0,0 +1,107 @@
+package metrics
+
+import (
+ "bytes"
+ "fmt"
+ "net"
+ "strings"
+ "time"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+type GraphitePublisher struct {
+ address string
+ protocol string
+ prefix string
+ prevCounts map[string]int64
+}
+
+func CreateGraphitePublisher() (*GraphitePublisher, error) {
+ graphiteSection, err := setting.Cfg.GetSection("metrics.graphite")
+ if err != nil {
+ return nil, nil
+ }
+
+ address := graphiteSection.Key("address").String()
+ if address == "" {
+ return nil, nil
+ }
+
+ publisher := &GraphitePublisher{}
+ publisher.prevCounts = make(map[string]int64)
+ publisher.protocol = "tcp"
+ publisher.prefix = graphiteSection.Key("prefix").MustString("prod.grafana.%(instance_name)s")
+ publisher.address = address
+
+ safeInstanceName := strings.Replace(setting.InstanceName, ".", "_", -1)
+ prefix := graphiteSection.Key("prefix").Value()
+
+ if prefix == "" {
+ prefix = "prod.grafana.%(instance_name)s."
+ }
+
+ publisher.prefix = strings.Replace(prefix, "%(instance_name)s", safeInstanceName, -1)
+ return publisher, nil
+}
+
+func (this *GraphitePublisher) Publish(metrics []Metric) {
+ conn, err := net.DialTimeout(this.protocol, this.address, time.Second*5)
+
+ if err != nil {
+ log.Error(3, "Metrics: GraphitePublisher: Failed to connect to %s!", err)
+ return
+ }
+
+ buf := bytes.NewBufferString("")
+ now := time.Now().Unix()
+
+ for _, m := range metrics {
+ metricName := this.prefix + m.Name() + m.StringifyTags()
+
+ switch metric := m.(type) {
+ case Counter:
+ this.addCount(buf, metricName+".count", metric.Count(), now)
+ case Gauge:
+ this.addCount(buf, metricName, metric.Value(), now)
+ case Timer:
+ percentiles := metric.Percentiles([]float64{0.25, 0.75, 0.90, 0.99})
+ this.addCount(buf, metricName+".count", metric.Count(), now)
+ this.addInt(buf, metricName+".max", metric.Max(), now)
+ this.addInt(buf, metricName+".min", metric.Min(), now)
+ this.addFloat(buf, metricName+".mean", metric.Mean(), now)
+ this.addFloat(buf, metricName+".std", metric.StdDev(), now)
+ this.addFloat(buf, metricName+".p25", percentiles[0], now)
+ this.addFloat(buf, metricName+".p75", percentiles[1], now)
+ this.addFloat(buf, metricName+".p90", percentiles[2], now)
+ this.addFloat(buf, metricName+".p99", percentiles[3], now)
+ }
+ }
+
+ log.Trace("Metrics: GraphitePublisher.Publish() \n%s", buf)
+ _, err = conn.Write(buf.Bytes())
+
+ if err != nil {
+ log.Error(3, "Metrics: GraphitePublisher: Failed to send metrics! %s", err)
+ }
+}
+
+func (this *GraphitePublisher) addInt(buf *bytes.Buffer, metric string, value int64, now int64) {
+ buf.WriteString(fmt.Sprintf("%s %d %d\n", metric, value, now))
+}
+
+func (this *GraphitePublisher) addFloat(buf *bytes.Buffer, metric string, value float64, now int64) {
+ buf.WriteString(fmt.Sprintf("%s %f %d\n", metric, value, now))
+}
+
+func (this *GraphitePublisher) addCount(buf *bytes.Buffer, metric string, value int64, now int64) {
+ delta := value
+
+ if last, ok := this.prevCounts[metric]; ok {
+ delta = calculateDelta(last, value)
+ }
+
+ this.prevCounts[metric] = value
+ buf.WriteString(fmt.Sprintf("%s %d %d\n", metric, delta, now))
+}
diff --git a/pkg/metrics/graphite_test.go b/pkg/metrics/graphite_test.go
new file mode 100644
index 00000000000..ff2bf530d5e
--- /dev/null
+++ b/pkg/metrics/graphite_test.go
@@ -0,0 +1,77 @@
+package metrics
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/setting"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestGraphitePublisher(t *testing.T) {
+
+ setting.CustomInitPath = "conf/does_not_exist.ini"
+
+ Convey("Test graphite prefix replacement", t, func() {
+ var err error
+ err = setting.NewConfigContext(&setting.CommandLineArgs{
+ HomePath: "../../",
+ })
+
+ So(err, ShouldBeNil)
+
+ sec, err := setting.Cfg.NewSection("metrics.graphite")
+ sec.NewKey("prefix", "prod.grafana.%(instance_name)s.")
+ sec.NewKey("address", "localhost:2001")
+
+ So(err, ShouldBeNil)
+
+ setting.InstanceName = "hostname.with.dots.com"
+ publisher, err := CreateGraphitePublisher()
+
+ So(err, ShouldBeNil)
+ So(publisher, ShouldNotBeNil)
+
+ So(publisher.prefix, ShouldEqual, "prod.grafana.hostname_with_dots_com.")
+ So(publisher.address, ShouldEqual, "localhost:2001")
+ })
+
+ Convey("Test graphite publisher default prefix", t, func() {
+ var err error
+ err = setting.NewConfigContext(&setting.CommandLineArgs{
+ HomePath: "../../",
+ })
+
+ So(err, ShouldBeNil)
+
+ sec, err := setting.Cfg.NewSection("metrics.graphite")
+ sec.NewKey("address", "localhost:2001")
+
+ So(err, ShouldBeNil)
+
+ setting.InstanceName = "hostname.with.dots.com"
+ publisher, err := CreateGraphitePublisher()
+
+ So(err, ShouldBeNil)
+ So(publisher, ShouldNotBeNil)
+
+ So(publisher.prefix, ShouldEqual, "prod.grafana.hostname_with_dots_com.")
+ So(publisher.address, ShouldEqual, "localhost:2001")
+ })
+
+ Convey("Test graphite publisher default values", t, func() {
+ var err error
+ err = setting.NewConfigContext(&setting.CommandLineArgs{
+ HomePath: "../../",
+ })
+
+ So(err, ShouldBeNil)
+
+ _, err = setting.Cfg.NewSection("metrics.graphite")
+
+ publisher, err := CreateGraphitePublisher()
+
+ So(err, ShouldBeNil)
+ So(publisher, ShouldBeNil)
+ })
+}
diff --git a/pkg/metrics/histogram.go b/pkg/metrics/histogram.go
new file mode 100644
index 00000000000..32338da4b69
--- /dev/null
+++ b/pkg/metrics/histogram.go
@@ -0,0 +1,189 @@
+// includes code from
+// https://raw.githubusercontent.com/rcrowley/go-metrics/master/sample.go
+// Copyright 2012 Richard Crowley. All rights reserved.
+
+package metrics
+
+// Histograms calculate distribution statistics from a series of int64 values.
+type Histogram interface {
+ Metric
+
+ Clear()
+ Count() int64
+ Max() int64
+ Mean() float64
+ Min() int64
+ Percentile(float64) float64
+ Percentiles([]float64) []float64
+ StdDev() float64
+ Sum() int64
+ Update(int64)
+ Variance() float64
+}
+
+func NewHistogram(meta *MetricMeta, s Sample) Histogram {
+ return &StandardHistogram{
+ MetricMeta: meta,
+ sample: s,
+ }
+}
+
+// HistogramSnapshot is a read-only copy of another Histogram.
+type HistogramSnapshot struct {
+ *MetricMeta
+ sample *SampleSnapshot
+}
+
+// Clear panics.
+func (*HistogramSnapshot) Clear() {
+ panic("Clear called on a HistogramSnapshot")
+}
+
+// Count returns the number of samples recorded at the time the snapshot was
+// taken.
+func (h *HistogramSnapshot) Count() int64 { return h.sample.Count() }
+
+// Max returns the maximum value in the sample at the time the snapshot was
+// taken.
+func (h *HistogramSnapshot) Max() int64 { return h.sample.Max() }
+
+// Mean returns the mean of the values in the sample at the time the snapshot
+// was taken.
+func (h *HistogramSnapshot) Mean() float64 { return h.sample.Mean() }
+
+// Min returns the minimum value in the sample at the time the snapshot was
+// taken.
+func (h *HistogramSnapshot) Min() int64 { return h.sample.Min() }
+
+// Percentile returns an arbitrary percentile of values in the sample at the
+// time the snapshot was taken.
+func (h *HistogramSnapshot) Percentile(p float64) float64 {
+ return h.sample.Percentile(p)
+}
+
+// Percentiles returns a slice of arbitrary percentiles of values in the sample
+// at the time the snapshot was taken.
+func (h *HistogramSnapshot) Percentiles(ps []float64) []float64 {
+ return h.sample.Percentiles(ps)
+}
+
+// Sample returns the Sample underlying the histogram.
+func (h *HistogramSnapshot) Sample() Sample { return h.sample }
+
+// Snapshot returns the snapshot.
+func (h *HistogramSnapshot) Snapshot() Metric { return h }
+
+// StdDev returns the standard deviation of the values in the sample at the
+// time the snapshot was taken.
+func (h *HistogramSnapshot) StdDev() float64 { return h.sample.StdDev() }
+
+// Sum returns the sum in the sample at the time the snapshot was taken.
+func (h *HistogramSnapshot) Sum() int64 { return h.sample.Sum() }
+
+// Update panics.
+func (*HistogramSnapshot) Update(int64) {
+ panic("Update called on a HistogramSnapshot")
+}
+
+// Variance returns the variance of inputs at the time the snapshot was taken.
+func (h *HistogramSnapshot) Variance() float64 { return h.sample.Variance() }
+
+// NilHistogram is a no-op Histogram.
+type NilHistogram struct {
+ *MetricMeta
+}
+
+// Clear is a no-op.
+func (NilHistogram) Clear() {}
+
+// Count is a no-op.
+func (NilHistogram) Count() int64 { return 0 }
+
+// Max is a no-op.
+func (NilHistogram) Max() int64 { return 0 }
+
+// Mean is a no-op.
+func (NilHistogram) Mean() float64 { return 0.0 }
+
+// Min is a no-op.
+func (NilHistogram) Min() int64 { return 0 }
+
+// Percentile is a no-op.
+func (NilHistogram) Percentile(p float64) float64 { return 0.0 }
+
+// Percentiles is a no-op.
+func (NilHistogram) Percentiles(ps []float64) []float64 {
+ return make([]float64, len(ps))
+}
+
+// Sample is a no-op.
+func (NilHistogram) Sample() Sample { return NilSample{} }
+
+// Snapshot is a no-op.
+func (n NilHistogram) Snapshot() Metric { return n }
+
+// StdDev is a no-op.
+func (NilHistogram) StdDev() float64 { return 0.0 }
+
+// Sum is a no-op.
+func (NilHistogram) Sum() int64 { return 0 }
+
+// Update is a no-op.
+func (NilHistogram) Update(v int64) {}
+
+// Variance is a no-op.
+func (NilHistogram) Variance() float64 { return 0.0 }
+
+// StandardHistogram is the standard implementation of a Histogram and uses a
+// Sample to bound its memory use.
+type StandardHistogram struct {
+ *MetricMeta
+ sample Sample
+}
+
+// Clear clears the histogram and its sample.
+func (h *StandardHistogram) Clear() { h.sample.Clear() }
+
+// Count returns the number of samples recorded since the histogram was last
+// cleared.
+func (h *StandardHistogram) Count() int64 { return h.sample.Count() }
+
+// Max returns the maximum value in the sample.
+func (h *StandardHistogram) Max() int64 { return h.sample.Max() }
+
+// Mean returns the mean of the values in the sample.
+func (h *StandardHistogram) Mean() float64 { return h.sample.Mean() }
+
+// Min returns the minimum value in the sample.
+func (h *StandardHistogram) Min() int64 { return h.sample.Min() }
+
+// Percentile returns an arbitrary percentile of the values in the sample.
+func (h *StandardHistogram) Percentile(p float64) float64 {
+ return h.sample.Percentile(p)
+}
+
+// Percentiles returns a slice of arbitrary percentiles of the values in the
+// sample.
+func (h *StandardHistogram) Percentiles(ps []float64) []float64 {
+ return h.sample.Percentiles(ps)
+}
+
+// Sample returns the Sample underlying the histogram.
+func (h *StandardHistogram) Sample() Sample { return h.sample }
+
+// Snapshot returns a read-only copy of the histogram.
+func (h *StandardHistogram) Snapshot() Metric {
+ return &HistogramSnapshot{sample: h.sample.Snapshot().(*SampleSnapshot)}
+}
+
+// StdDev returns the standard deviation of the values in the sample.
+func (h *StandardHistogram) StdDev() float64 { return h.sample.StdDev() }
+
+// Sum returns the sum in the sample.
+func (h *StandardHistogram) Sum() int64 { return h.sample.Sum() }
+
+// Update samples a new value.
+func (h *StandardHistogram) Update(v int64) { h.sample.Update(v) }
+
+// Variance returns the variance of the values in the sample.
+func (h *StandardHistogram) Variance() float64 { return h.sample.Variance() }
diff --git a/pkg/metrics/histogram_test.go b/pkg/metrics/histogram_test.go
new file mode 100644
index 00000000000..010402123c2
--- /dev/null
+++ b/pkg/metrics/histogram_test.go
@@ -0,0 +1,90 @@
+// includes code from
+// https://raw.githubusercontent.com/rcrowley/go-metrics/master/sample.go
+// Copyright 2012 Richard Crowley. All rights reserved.
+
+package metrics
+
+import "testing"
+
+func BenchmarkHistogram(b *testing.B) {
+ h := NewHistogram(nil, NewUniformSample(100))
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ h.Update(int64(i))
+ }
+}
+
+func TestHistogram10000(t *testing.T) {
+ h := NewHistogram(nil, NewUniformSample(100000))
+ for i := 1; i <= 10000; i++ {
+ h.Update(int64(i))
+ }
+ testHistogram10000(t, h)
+}
+
+func TestHistogramEmpty(t *testing.T) {
+ h := NewHistogram(nil, NewUniformSample(100))
+ if count := h.Count(); 0 != count {
+ t.Errorf("h.Count(): 0 != %v\n", count)
+ }
+ if min := h.Min(); 0 != min {
+ t.Errorf("h.Min(): 0 != %v\n", min)
+ }
+ if max := h.Max(); 0 != max {
+ t.Errorf("h.Max(): 0 != %v\n", max)
+ }
+ if mean := h.Mean(); 0.0 != mean {
+ t.Errorf("h.Mean(): 0.0 != %v\n", mean)
+ }
+ if stdDev := h.StdDev(); 0.0 != stdDev {
+ t.Errorf("h.StdDev(): 0.0 != %v\n", stdDev)
+ }
+ ps := h.Percentiles([]float64{0.5, 0.75, 0.99})
+ if 0.0 != ps[0] {
+ t.Errorf("median: 0.0 != %v\n", ps[0])
+ }
+ if 0.0 != ps[1] {
+ t.Errorf("75th percentile: 0.0 != %v\n", ps[1])
+ }
+ if 0.0 != ps[2] {
+ t.Errorf("99th percentile: 0.0 != %v\n", ps[2])
+ }
+}
+
+func TestHistogramSnapshot(t *testing.T) {
+ h := NewHistogram(nil, NewUniformSample(100000))
+ for i := 1; i <= 10000; i++ {
+ h.Update(int64(i))
+ }
+ snapshot := h.Snapshot().(Histogram)
+ h.Update(0)
+ testHistogram10000(t, snapshot)
+}
+
+func testHistogram10000(t *testing.T, h Histogram) {
+ if count := h.Count(); 10000 != count {
+ t.Errorf("h.Count(): 10000 != %v\n", count)
+ }
+ if min := h.Min(); 1 != min {
+ t.Errorf("h.Min(): 1 != %v\n", min)
+ }
+ if max := h.Max(); 10000 != max {
+ t.Errorf("h.Max(): 10000 != %v\n", max)
+ }
+ if mean := h.Mean(); 5000.5 != mean {
+ t.Errorf("h.Mean(): 5000.5 != %v\n", mean)
+ }
+ if stdDev := h.StdDev(); 2886.751331514372 != stdDev {
+ t.Errorf("h.StdDev(): 2886.751331514372 != %v\n", stdDev)
+ }
+ ps := h.Percentiles([]float64{0.5, 0.75, 0.99})
+ if 5000.5 != ps[0] {
+ t.Errorf("median: 5000.5 != %v\n", ps[0])
+ }
+ if 7500.75 != ps[1] {
+ t.Errorf("75th percentile: 7500.75 != %v\n", ps[1])
+ }
+ if 9900.99 != ps[2] {
+ t.Errorf("99th percentile: 9900.99 != %v\n", ps[2])
+ }
+}
diff --git a/pkg/metrics/meter.go b/pkg/metrics/meter.go
new file mode 100644
index 00000000000..8744a5cd040
--- /dev/null
+++ b/pkg/metrics/meter.go
@@ -0,0 +1,221 @@
+// includes code from
+// https://raw.githubusercontent.com/rcrowley/go-metrics/master/sample.go
+// Copyright 2012 Richard Crowley. All rights reserved.
+
+package metrics
+
+import (
+ "sync"
+ "time"
+)
+
+// Meters count events to produce exponentially-weighted moving average rates
+// at one-, five-, and fifteen-minutes and a mean rate.
+type Meter interface {
+ Metric
+
+ Count() int64
+ Mark(int64)
+ Rate1() float64
+ Rate5() float64
+ Rate15() float64
+ RateMean() float64
+}
+
+// NewMeter constructs a new StandardMeter and launches a goroutine.
+func NewMeter(meta *MetricMeta) Meter {
+ if UseNilMetrics {
+ return NilMeter{}
+ }
+
+ m := newStandardMeter(meta)
+ arbiter.Lock()
+ defer arbiter.Unlock()
+ arbiter.meters = append(arbiter.meters, m)
+ if !arbiter.started {
+ arbiter.started = true
+ go arbiter.tick()
+ }
+ return m
+}
+
+type MeterSnapshot struct {
+ *MetricMeta
+ count int64
+ rate1, rate5, rate15, rateMean float64
+}
+
+// Count returns the count of events at the time the snapshot was taken.
+func (m *MeterSnapshot) Count() int64 { return m.count }
+
+// Mark panics.
+func (*MeterSnapshot) Mark(n int64) {
+ panic("Mark called on a MeterSnapshot")
+}
+
+// Rate1 returns the one-minute moving average rate of events per second at the
+// time the snapshot was taken.
+func (m *MeterSnapshot) Rate1() float64 { return m.rate1 }
+
+// Rate5 returns the five-minute moving average rate of events per second at
+// the time the snapshot was taken.
+func (m *MeterSnapshot) Rate5() float64 { return m.rate5 }
+
+// Rate15 returns the fifteen-minute moving average rate of events per second
+// at the time the snapshot was taken.
+func (m *MeterSnapshot) Rate15() float64 { return m.rate15 }
+
+// RateMean returns the meter's mean rate of events per second at the time the
+// snapshot was taken.
+func (m *MeterSnapshot) RateMean() float64 { return m.rateMean }
+
+// Snapshot returns the snapshot.
+func (m *MeterSnapshot) Snapshot() Metric { return m }
+
+// NilMeter is a no-op Meter.
+type NilMeter struct{ *MetricMeta }
+
+// Count is a no-op.
+func (NilMeter) Count() int64 { return 0 }
+
+// Mark is a no-op.
+func (NilMeter) Mark(n int64) {}
+
+// Rate1 is a no-op.
+func (NilMeter) Rate1() float64 { return 0.0 }
+
+// Rate5 is a no-op.
+func (NilMeter) Rate5() float64 { return 0.0 }
+
+// Rate15is a no-op.
+func (NilMeter) Rate15() float64 { return 0.0 }
+
+// RateMean is a no-op.
+func (NilMeter) RateMean() float64 { return 0.0 }
+
+// Snapshot is a no-op.
+func (NilMeter) Snapshot() Metric { return NilMeter{} }
+
+// StandardMeter is the standard implementation of a Meter.
+type StandardMeter struct {
+ *MetricMeta
+ lock sync.RWMutex
+ snapshot *MeterSnapshot
+ a1, a5, a15 EWMA
+ startTime time.Time
+}
+
+func newStandardMeter(meta *MetricMeta) *StandardMeter {
+ return &StandardMeter{
+ MetricMeta: meta,
+ snapshot: &MeterSnapshot{MetricMeta: meta},
+ a1: NewEWMA1(),
+ a5: NewEWMA5(),
+ a15: NewEWMA15(),
+ startTime: time.Now(),
+ }
+}
+
+// Count returns the number of events recorded.
+func (m *StandardMeter) Count() int64 {
+ m.lock.RLock()
+ count := m.snapshot.count
+ m.lock.RUnlock()
+ return count
+}
+
+// Mark records the occurance of n events.
+func (m *StandardMeter) Mark(n int64) {
+ m.lock.Lock()
+ defer m.lock.Unlock()
+ m.snapshot.count += n
+ m.a1.Update(n)
+ m.a5.Update(n)
+ m.a15.Update(n)
+ m.updateSnapshot()
+}
+
+// Rate1 returns the one-minute moving average rate of events per second.
+func (m *StandardMeter) Rate1() float64 {
+ m.lock.RLock()
+ rate1 := m.snapshot.rate1
+ m.lock.RUnlock()
+ return rate1
+}
+
+// Rate5 returns the five-minute moving average rate of events per second.
+func (m *StandardMeter) Rate5() float64 {
+ m.lock.RLock()
+ rate5 := m.snapshot.rate5
+ m.lock.RUnlock()
+ return rate5
+}
+
+// Rate15 returns the fifteen-minute moving average rate of events per second.
+func (m *StandardMeter) Rate15() float64 {
+ m.lock.RLock()
+ rate15 := m.snapshot.rate15
+ m.lock.RUnlock()
+ return rate15
+}
+
+// RateMean returns the meter's mean rate of events per second.
+func (m *StandardMeter) RateMean() float64 {
+ m.lock.RLock()
+ rateMean := m.snapshot.rateMean
+ m.lock.RUnlock()
+ return rateMean
+}
+
+// Snapshot returns a read-only copy of the meter.
+func (m *StandardMeter) Snapshot() Metric {
+ m.lock.RLock()
+ snapshot := *m.snapshot
+ m.lock.RUnlock()
+ return &snapshot
+}
+
+func (m *StandardMeter) updateSnapshot() {
+ // should run with write lock held on m.lock
+ snapshot := m.snapshot
+ snapshot.rate1 = m.a1.Rate()
+ snapshot.rate5 = m.a5.Rate()
+ snapshot.rate15 = m.a15.Rate()
+ snapshot.rateMean = float64(snapshot.count) / time.Since(m.startTime).Seconds()
+}
+
+func (m *StandardMeter) tick() {
+ m.lock.Lock()
+ defer m.lock.Unlock()
+ m.a1.Tick()
+ m.a5.Tick()
+ m.a15.Tick()
+ m.updateSnapshot()
+}
+
+type meterArbiter struct {
+ sync.RWMutex
+ started bool
+ meters []*StandardMeter
+ ticker *time.Ticker
+}
+
+var arbiter = meterArbiter{ticker: time.NewTicker(5e9)}
+
+// Ticks meters on the scheduled interval
+func (ma *meterArbiter) tick() {
+ for {
+ select {
+ case <-ma.ticker.C:
+ ma.tickMeters()
+ }
+ }
+}
+
+func (ma *meterArbiter) tickMeters() {
+ ma.RLock()
+ defer ma.RUnlock()
+ for _, meter := range ma.meters {
+ meter.tick()
+ }
+}
diff --git a/pkg/metrics/metric_ref.go b/pkg/metrics/metric_ref.go
deleted file mode 100644
index f9e5d693d4c..00000000000
--- a/pkg/metrics/metric_ref.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package metrics
-
-type comboCounterRef struct {
- usageCounter Counter
- metricCounter Counter
-}
-
-func NewComboCounterRef(name string) Counter {
- cr := &comboCounterRef{}
- cr.usageCounter = UsageStats.GetOrRegister(name, NewCounter).(Counter)
- cr.metricCounter = MetricStats.GetOrRegister(name, NewCounter).(Counter)
- return cr
-}
-
-func (c comboCounterRef) Clear() {
- c.usageCounter.Clear()
- c.metricCounter.Clear()
-}
-
-func (c comboCounterRef) Count() int64 {
- panic("Count called on a combocounter ref")
-}
-
-// Dec panics.
-func (c comboCounterRef) Dec(i int64) {
- c.usageCounter.Dec(i)
- c.metricCounter.Dec(i)
-}
-
-// Inc panics.
-func (c comboCounterRef) Inc(i int64) {
- c.usageCounter.Inc(i)
- c.metricCounter.Inc(i)
-}
-
-// Snapshot returns the snapshot.
-func (c comboCounterRef) Snapshot() Counter {
- panic("snapshot called on a combocounter ref")
-}
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
index 8e10b2428b4..5f937a5cbd8 100644
--- a/pkg/metrics/metrics.go
+++ b/pkg/metrics/metrics.go
@@ -1,31 +1,133 @@
package metrics
-var UsageStats = NewRegistry()
-var MetricStats = NewRegistry()
+var MetricStats Registry
+var UseNilMetrics bool
+
+func init() {
+ // init with nil metrics
+ initMetricVars(&MetricSettings{})
+}
var (
- M_Instance_Start = NewComboCounterRef("instance.start")
+ M_Instance_Start Counter
+ M_Page_Status_200 Counter
+ M_Page_Status_500 Counter
+ M_Page_Status_404 Counter
+ M_Page_Status_Unknown Counter
+ M_Api_Status_200 Counter
+ M_Api_Status_404 Counter
+ M_Api_Status_500 Counter
+ M_Api_Status_Unknown Counter
+ M_Proxy_Status_200 Counter
+ M_Proxy_Status_404 Counter
+ M_Proxy_Status_500 Counter
+ M_Proxy_Status_Unknown Counter
+ M_Api_User_SignUpStarted Counter
+ M_Api_User_SignUpCompleted Counter
+ M_Api_User_SignUpInvite Counter
+ M_Api_Dashboard_Save Timer
+ M_Api_Dashboard_Get Timer
+ M_Api_Dashboard_Search Timer
+ M_Api_Admin_User_Create Counter
+ M_Api_Login_Post Counter
+ M_Api_Login_OAuth Counter
+ M_Api_Org_Create Counter
+ M_Api_Dashboard_Snapshot_Create Counter
+ M_Api_Dashboard_Snapshot_External Counter
+ M_Api_Dashboard_Snapshot_Get Counter
+ M_Models_Dashboard_Insert Counter
+ M_Alerting_Result_State_Alerting Counter
+ M_Alerting_Result_State_Ok Counter
+ M_Alerting_Result_State_Paused Counter
+ M_Alerting_Result_State_NoData Counter
+ M_Alerting_Result_State_Pending Counter
+ M_Alerting_Notification_Sent_Slack Counter
+ M_Alerting_Notification_Sent_Email Counter
+ M_Alerting_Notification_Sent_Webhook Counter
+ M_Alerting_Notification_Sent_PagerDuty Counter
+ M_Alerting_Notification_Sent_Victorops Counter
+ M_Alerting_Notification_Sent_OpsGenie Counter
+ M_Alerting_Notification_Sent_Telegram Counter
+ M_Aws_CloudWatch_GetMetricStatistics Counter
+ M_Aws_CloudWatch_ListMetrics Counter
- M_Page_Status_200 = NewComboCounterRef("page.status.200")
- M_Page_Status_500 = NewComboCounterRef("page.status.500")
- M_Page_Status_404 = NewComboCounterRef("page.status.404")
+ // Timers
+ M_DataSource_ProxyReq_Timer Timer
+ M_Alerting_Execution_Time Timer
- M_Api_Status_500 = NewComboCounterRef("api.status.500")
- M_Api_Status_404 = NewComboCounterRef("api.status.404")
-
- M_Api_User_SignUpStarted = NewComboCounterRef("api.user.signup_started")
- M_Api_User_SignUpCompleted = NewComboCounterRef("api.user.signup_completed")
- M_Api_User_SignUpInvite = NewComboCounterRef("api.user.signup_invite")
- M_Api_Dashboard_Get = NewComboCounterRef("api.dashboard.get")
- M_Api_Dashboard_Post = NewComboCounterRef("api.dashboard.post")
- M_Api_Admin_User_Create = NewComboCounterRef("api.admin.user_create")
- M_Api_Login_Post = NewComboCounterRef("api.login.post")
- M_Api_Login_OAuth = NewComboCounterRef("api.login.oauth")
- M_Api_Org_Create = NewComboCounterRef("api.org.create")
-
- M_Api_Dashboard_Snapshot_Create = NewComboCounterRef("api.dashboard_snapshot.create")
- M_Api_Dashboard_Snapshot_External = NewComboCounterRef("api.dashboard_snapshot.external")
- M_Api_Dashboard_Snapshot_Get = NewComboCounterRef("api.dashboard_snapshot.get")
-
- M_Models_Dashboard_Insert = NewComboCounterRef("models.dashboard.insert")
+ // StatTotals
+ M_Alerting_Active_Alerts Gauge
+ M_StatTotal_Dashboards Gauge
+ M_StatTotal_Users Gauge
+ M_StatTotal_Orgs Gauge
+ M_StatTotal_Playlists Gauge
)
+
+func initMetricVars(settings *MetricSettings) {
+ UseNilMetrics = settings.Enabled == false
+ MetricStats = NewRegistry()
+
+ M_Instance_Start = RegCounter("instance_start")
+
+ M_Page_Status_200 = RegCounter("page.resp_status", "code", "200")
+ M_Page_Status_500 = RegCounter("page.resp_status", "code", "500")
+ M_Page_Status_404 = RegCounter("page.resp_status", "code", "404")
+ M_Page_Status_Unknown = RegCounter("page.resp_status", "code", "unknown")
+
+ M_Api_Status_200 = RegCounter("api.resp_status", "code", "200")
+ M_Api_Status_404 = RegCounter("api.resp_status", "code", "404")
+ M_Api_Status_500 = RegCounter("api.resp_status", "code", "500")
+ M_Api_Status_Unknown = RegCounter("api.resp_status", "code", "unknown")
+
+ M_Proxy_Status_200 = RegCounter("proxy.resp_status", "code", "200")
+ M_Proxy_Status_404 = RegCounter("proxy.resp_status", "code", "404")
+ M_Proxy_Status_500 = RegCounter("proxy.resp_status", "code", "500")
+ M_Proxy_Status_Unknown = RegCounter("proxy.resp_status", "code", "unknown")
+
+ M_Api_User_SignUpStarted = RegCounter("api.user.signup_started")
+ M_Api_User_SignUpCompleted = RegCounter("api.user.signup_completed")
+ M_Api_User_SignUpInvite = RegCounter("api.user.signup_invite")
+
+ M_Api_Dashboard_Save = RegTimer("api.dashboard.save")
+ M_Api_Dashboard_Get = RegTimer("api.dashboard.get")
+ M_Api_Dashboard_Search = RegTimer("api.dashboard.search")
+
+ M_Api_Admin_User_Create = RegCounter("api.admin.user_create")
+ M_Api_Login_Post = RegCounter("api.login.post")
+ M_Api_Login_OAuth = RegCounter("api.login.oauth")
+ M_Api_Org_Create = RegCounter("api.org.create")
+
+ M_Api_Dashboard_Snapshot_Create = RegCounter("api.dashboard_snapshot.create")
+ M_Api_Dashboard_Snapshot_External = RegCounter("api.dashboard_snapshot.external")
+ M_Api_Dashboard_Snapshot_Get = RegCounter("api.dashboard_snapshot.get")
+
+ M_Models_Dashboard_Insert = RegCounter("models.dashboard.insert")
+
+ M_Alerting_Result_State_Alerting = RegCounter("alerting.result", "state", "alerting")
+ M_Alerting_Result_State_Ok = RegCounter("alerting.result", "state", "ok")
+ M_Alerting_Result_State_Paused = RegCounter("alerting.result", "state", "paused")
+ M_Alerting_Result_State_NoData = RegCounter("alerting.result", "state", "no_data")
+ M_Alerting_Result_State_Pending = RegCounter("alerting.result", "state", "pending")
+
+ M_Alerting_Notification_Sent_Slack = RegCounter("alerting.notifications_sent", "type", "slack")
+ M_Alerting_Notification_Sent_Email = RegCounter("alerting.notifications_sent", "type", "email")
+ M_Alerting_Notification_Sent_Webhook = RegCounter("alerting.notifications_sent", "type", "webhook")
+ M_Alerting_Notification_Sent_PagerDuty = RegCounter("alerting.notifications_sent", "type", "pagerduty")
+ M_Alerting_Notification_Sent_Victorops = RegCounter("alerting.notifications_sent", "type", "victorops")
+ M_Alerting_Notification_Sent_OpsGenie = RegCounter("alerting.notifications_sent", "type", "opsgenie")
+ M_Alerting_Notification_Sent_Telegram = RegCounter("alerting.notifications_sent", "type", "telegram")
+
+ M_Aws_CloudWatch_GetMetricStatistics = RegCounter("aws.cloudwatch.get_metric_statistics")
+ M_Aws_CloudWatch_ListMetrics = RegCounter("aws.cloudwatch.list_metrics")
+
+ // Timers
+ M_DataSource_ProxyReq_Timer = RegTimer("api.dataproxy.request.all")
+ M_Alerting_Execution_Time = RegTimer("alerting.execution_time")
+
+ // StatTotals
+ M_Alerting_Active_Alerts = RegGauge("alerting.active_alerts")
+ M_StatTotal_Dashboards = RegGauge("stat_totals", "stat", "dashboards")
+ M_StatTotal_Users = RegGauge("stat_totals", "stat", "users")
+ M_StatTotal_Orgs = RegGauge("stat_totals", "stat", "orgs")
+ M_StatTotal_Playlists = RegGauge("stat_totals", "stat", "playlists")
+}
diff --git a/pkg/metrics/publish.go b/pkg/metrics/publish.go
new file mode 100644
index 00000000000..70db3fc0f86
--- /dev/null
+++ b/pkg/metrics/publish.go
@@ -0,0 +1,130 @@
+package metrics
+
+import (
+ "bytes"
+ "encoding/json"
+ "net/http"
+ "strings"
+ "time"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/log"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/plugins"
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+var metricsLogger log.Logger = log.New("metrics")
+var metricPublishCounter int64 = 0
+
+func Init() {
+ settings := readSettings()
+ initMetricVars(settings)
+ go instrumentationLoop(settings)
+}
+
+func instrumentationLoop(settings *MetricSettings) chan struct{} {
+ M_Instance_Start.Inc(1)
+
+ onceEveryDayTick := time.NewTicker(time.Hour * 24)
+ secondTicker := time.NewTicker(time.Second * time.Duration(settings.IntervalSeconds))
+
+ for {
+ select {
+ case <-onceEveryDayTick.C:
+ sendUsageStats()
+ case <-secondTicker.C:
+ if settings.Enabled {
+ sendMetrics(settings)
+ }
+ }
+ }
+}
+
+func sendMetrics(settings *MetricSettings) {
+ if len(settings.Publishers) == 0 {
+ return
+ }
+
+ updateTotalStats()
+
+ metrics := MetricStats.GetSnapshots()
+ for _, publisher := range settings.Publishers {
+ publisher.Publish(metrics)
+ }
+}
+
+func updateTotalStats() {
+
+ // every interval also publish totals
+ metricPublishCounter++
+ if metricPublishCounter%10 == 0 {
+ // get stats
+ statsQuery := m.GetSystemStatsQuery{}
+ if err := bus.Dispatch(&statsQuery); err != nil {
+ metricsLogger.Error("Failed to get system stats", "error", err)
+ return
+ }
+
+ M_StatTotal_Dashboards.Update(statsQuery.Result.DashboardCount)
+ M_StatTotal_Users.Update(statsQuery.Result.UserCount)
+ M_StatTotal_Playlists.Update(statsQuery.Result.PlaylistCount)
+ M_StatTotal_Orgs.Update(statsQuery.Result.OrgCount)
+ }
+}
+
+func sendUsageStats() {
+ if !setting.ReportingEnabled {
+ return
+ }
+
+ metricsLogger.Debug("Sending anonymous usage stats to stats.grafana.org")
+
+ version := strings.Replace(setting.BuildVersion, ".", "_", -1)
+
+ metrics := map[string]interface{}{}
+ report := map[string]interface{}{
+ "version": version,
+ "metrics": metrics,
+ }
+
+ statsQuery := m.GetSystemStatsQuery{}
+ if err := bus.Dispatch(&statsQuery); err != nil {
+ metricsLogger.Error("Failed to get system stats", "error", err)
+ return
+ }
+
+ metrics["stats.dashboards.count"] = statsQuery.Result.DashboardCount
+ metrics["stats.users.count"] = statsQuery.Result.UserCount
+ metrics["stats.orgs.count"] = statsQuery.Result.OrgCount
+ metrics["stats.playlist.count"] = statsQuery.Result.PlaylistCount
+ metrics["stats.plugins.apps.count"] = len(plugins.Apps)
+ metrics["stats.plugins.panels.count"] = len(plugins.Panels)
+ metrics["stats.plugins.datasources.count"] = len(plugins.DataSources)
+ metrics["stats.alerts.count"] = statsQuery.Result.AlertCount
+
+ dsStats := m.GetDataSourceStatsQuery{}
+ if err := bus.Dispatch(&dsStats); err != nil {
+ metricsLogger.Error("Failed to get datasource stats", "error", err)
+ return
+ }
+
+ // send counters for each data source
+ // but ignore any custom data sources
+ // as sending that name could be sensitive information
+ dsOtherCount := 0
+ for _, dsStat := range dsStats.Result {
+ if m.IsKnownDataSourcePlugin(dsStat.Type) {
+ metrics["stats.ds."+dsStat.Type+".count"] = dsStat.Count
+ } else {
+ dsOtherCount += dsStat.Count
+ }
+ }
+ metrics["stats.ds.other.count"] = dsOtherCount
+
+ out, _ := json.MarshalIndent(report, "", " ")
+ data := bytes.NewBuffer(out)
+
+ client := http.Client{Timeout: time.Duration(5 * time.Second)}
+ go client.Post("https://stats.grafana.org/grafana-usage-report", "application/json", data)
+}
diff --git a/pkg/metrics/registry.go b/pkg/metrics/registry.go
index 9e1618f3691..6c40d4fde9f 100644
--- a/pkg/metrics/registry.go
+++ b/pkg/metrics/registry.go
@@ -1,102 +1,37 @@
package metrics
-import (
- "fmt"
- "reflect"
- "sync"
-)
-
-// DuplicateMetric is the error returned by Registry.Register when a metric
-// already exists. If you mean to Register that metric you must first
-// Unregister the existing metric.
-type DuplicateMetric string
-
-func (err DuplicateMetric) Error() string {
- return fmt.Sprintf("duplicate metric: %s", string(err))
-}
+import "sync"
type Registry interface {
- // Call the given function for each registered metric.
- Each(func(string, interface{}))
-
- // Get the metric by the given name or nil if none is registered.
- Get(string) interface{}
-
- // Gets an existing metric or registers the given one.
- // The interface can be the metric to register if not found in registry,
- // or a function returning the metric for lazy instantiation.
- GetOrRegister(string, interface{}) interface{}
-
- // Register the given metric under the given name.
- Register(string, interface{}) error
+ GetSnapshots() []Metric
+ Register(metric Metric)
}
// The standard implementation of a Registry is a mutex-protected map
// of names to metrics.
type StandardRegistry struct {
- metrics map[string]interface{}
+ metrics []Metric
mutex sync.Mutex
}
// Create a new registry.
func NewRegistry() Registry {
- return &StandardRegistry{metrics: make(map[string]interface{})}
+ return &StandardRegistry{
+ metrics: make([]Metric, 0),
+ }
+}
+
+func (r *StandardRegistry) Register(metric Metric) {
+ r.mutex.Lock()
+ defer r.mutex.Unlock()
+ r.metrics = append(r.metrics, metric)
}
// Call the given function for each registered metric.
-func (r *StandardRegistry) Each(f func(string, interface{})) {
- for name, i := range r.registered() {
- f(name, i)
- }
-}
-
-// Get the metric by the given name or nil if none is registered.
-func (r *StandardRegistry) Get(name string) interface{} {
- r.mutex.Lock()
- defer r.mutex.Unlock()
- return r.metrics[name]
-}
-
-// Gets an existing metric or creates and registers a new one. Threadsafe
-// alternative to calling Get and Register on failure.
-// The interface can be the metric to register if not found in registry,
-// or a function returning the metric for lazy instantiation.
-func (r *StandardRegistry) GetOrRegister(name string, i interface{}) interface{} {
- r.mutex.Lock()
- defer r.mutex.Unlock()
- if metric, ok := r.metrics[name]; ok {
- return metric
- }
- if v := reflect.ValueOf(i); v.Kind() == reflect.Func {
- i = v.Call(nil)[0].Interface()
- }
- r.register(name, i)
- return i
-}
-
-// Register the given metric under the given name. Returns a DuplicateMetric
-// if a metric by the given name is already registered.
-func (r *StandardRegistry) Register(name string, i interface{}) error {
- r.mutex.Lock()
- defer r.mutex.Unlock()
- return r.register(name, i)
-}
-
-func (r *StandardRegistry) register(name string, i interface{}) error {
- if _, ok := r.metrics[name]; ok {
- return DuplicateMetric(name)
- }
-
- r.metrics[name] = i
- return nil
-}
-
-func (r *StandardRegistry) registered() map[string]interface{} {
- metrics := make(map[string]interface{}, len(r.metrics))
- r.mutex.Lock()
- defer r.mutex.Unlock()
- for name, i := range r.metrics {
- metrics[name] = i
+func (r *StandardRegistry) GetSnapshots() []Metric {
+ metrics := make([]Metric, len(r.metrics))
+ for i, metric := range r.metrics {
+ metrics[i] = metric.Snapshot()
}
return metrics
}
diff --git a/pkg/metrics/report_usage.go b/pkg/metrics/report_usage.go
deleted file mode 100644
index c5c2afed7f7..00000000000
--- a/pkg/metrics/report_usage.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package metrics
-
-import (
- "bytes"
- "encoding/json"
- "net/http"
- "strings"
- "time"
-
- "github.com/grafana/grafana/pkg/bus"
- "github.com/grafana/grafana/pkg/log"
- m "github.com/grafana/grafana/pkg/models"
- "github.com/grafana/grafana/pkg/setting"
-)
-
-func StartUsageReportLoop() chan struct{} {
- M_Instance_Start.Inc(1)
-
- ticker := time.NewTicker(time.Hour * 24)
- for {
- select {
- case <-ticker.C:
- sendUsageStats()
- }
- }
-}
-
-func sendUsageStats() {
- log.Trace("Sending anonymous usage stats to stats.grafana.org")
-
- version := strings.Replace(setting.BuildVersion, ".", "_", -1)
-
- metrics := map[string]interface{}{}
- report := map[string]interface{}{
- "version": version,
- "metrics": metrics,
- }
-
- UsageStats.Each(func(name string, i interface{}) {
- switch metric := i.(type) {
- case Counter:
- if metric.Count() > 0 {
- metrics[name+".count"] = metric.Count()
- metric.Clear()
- }
- }
- })
-
- statsQuery := m.GetSystemStatsQuery{}
- if err := bus.Dispatch(&statsQuery); err != nil {
- log.Error(3, "Failed to get system stats", err)
- return
- }
-
- metrics["stats.dashboards.count"] = statsQuery.Result.DashboardCount
- metrics["stats.users.count"] = statsQuery.Result.UserCount
- metrics["stats.orgs.count"] = statsQuery.Result.OrgCount
- metrics["stats.playlist.count"] = statsQuery.Result.PlaylistCount
-
- dsStats := m.GetDataSourceStatsQuery{}
- if err := bus.Dispatch(&dsStats); err != nil {
- log.Error(3, "Failed to get datasource stats", err)
- return
- }
-
- // send counters for each data source
- // but ignore any custom data sources
- // as sending that name could be sensitive information
- dsOtherCount := 0
- for _, dsStat := range dsStats.Result {
- if m.IsKnownDataSourcePlugin(dsStat.Type) {
- metrics["stats.ds."+dsStat.Type+".count"] = dsStat.Count
- } else {
- dsOtherCount += dsStat.Count
- }
- }
- metrics["stats.ds.other.count"] = dsOtherCount
-
- out, _ := json.MarshalIndent(report, "", " ")
- data := bytes.NewBuffer(out)
-
- client := http.Client{Timeout: time.Duration(5 * time.Second)}
- go client.Post("https://stats.grafana.org/grafana-usage-report", "application/json", data)
-}
diff --git a/pkg/metrics/sample.go b/pkg/metrics/sample.go
new file mode 100644
index 00000000000..4288f29cce6
--- /dev/null
+++ b/pkg/metrics/sample.go
@@ -0,0 +1,607 @@
+// includes code from
+// https://raw.githubusercontent.com/rcrowley/go-metrics/master/sample.go
+// Copyright 2012 Richard Crowley. All rights reserved.
+
+package metrics
+
+import (
+ "math"
+ "math/rand"
+ "sort"
+ "sync"
+ "time"
+)
+
+const rescaleThreshold = time.Hour
+
+// Samples maintain a statistically-significant selection of values from
+// a stream.
+type Sample interface {
+ Clear()
+ Count() int64
+ Max() int64
+ Mean() float64
+ Min() int64
+ Percentile(float64) float64
+ Percentiles([]float64) []float64
+ Size() int
+ Snapshot() Sample
+ StdDev() float64
+ Sum() int64
+ Update(int64)
+ Values() []int64
+ Variance() float64
+}
+
+// ExpDecaySample is an exponentially-decaying sample using a forward-decaying
+// priority reservoir. See Cormode et al's "Forward Decay: A Practical Time
+// Decay Model for Streaming Systems".
+//
+//
+type ExpDecaySample struct {
+ alpha float64
+ count int64
+ mutex sync.Mutex
+ reservoirSize int
+ t0, t1 time.Time
+ values *expDecaySampleHeap
+}
+
+// NewExpDecaySample constructs a new exponentially-decaying sample with the
+// given reservoir size and alpha.
+func NewExpDecaySample(reservoirSize int, alpha float64) Sample {
+ s := &ExpDecaySample{
+ alpha: alpha,
+ reservoirSize: reservoirSize,
+ t0: time.Now(),
+ values: newExpDecaySampleHeap(reservoirSize),
+ }
+ s.t1 = s.t0.Add(rescaleThreshold)
+ return s
+}
+
+// Clear clears all samples.
+func (s *ExpDecaySample) Clear() {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ s.count = 0
+ s.t0 = time.Now()
+ s.t1 = s.t0.Add(rescaleThreshold)
+ s.values.Clear()
+}
+
+// Count returns the number of samples recorded, which may exceed the
+// reservoir size.
+func (s *ExpDecaySample) Count() int64 {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ return s.count
+}
+
+// Max returns the maximum value in the sample, which may not be the maximum
+// value ever to be part of the sample.
+func (s *ExpDecaySample) Max() int64 {
+ return SampleMax(s.Values())
+}
+
+// Mean returns the mean of the values in the sample.
+func (s *ExpDecaySample) Mean() float64 {
+ return SampleMean(s.Values())
+}
+
+// Min returns the minimum value in the sample, which may not be the minimum
+// value ever to be part of the sample.
+func (s *ExpDecaySample) Min() int64 {
+ return SampleMin(s.Values())
+}
+
+// Percentile returns an arbitrary percentile of values in the sample.
+func (s *ExpDecaySample) Percentile(p float64) float64 {
+ return SamplePercentile(s.Values(), p)
+}
+
+// Percentiles returns a slice of arbitrary percentiles of values in the
+// sample.
+func (s *ExpDecaySample) Percentiles(ps []float64) []float64 {
+ return SamplePercentiles(s.Values(), ps)
+}
+
+// Size returns the size of the sample, which is at most the reservoir size.
+func (s *ExpDecaySample) Size() int {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ return s.values.Size()
+}
+
+// Snapshot returns a read-only copy of the sample.
+func (s *ExpDecaySample) Snapshot() Sample {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ vals := s.values.Values()
+ values := make([]int64, len(vals))
+ for i, v := range vals {
+ values[i] = v.v
+ }
+ return &SampleSnapshot{
+ count: s.count,
+ values: values,
+ }
+}
+
+// StdDev returns the standard deviation of the values in the sample.
+func (s *ExpDecaySample) StdDev() float64 {
+ return SampleStdDev(s.Values())
+}
+
+// Sum returns the sum of the values in the sample.
+func (s *ExpDecaySample) Sum() int64 {
+ return SampleSum(s.Values())
+}
+
+// Update samples a new value.
+func (s *ExpDecaySample) Update(v int64) {
+ s.update(time.Now(), v)
+}
+
+// Values returns a copy of the values in the sample.
+func (s *ExpDecaySample) Values() []int64 {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ vals := s.values.Values()
+ values := make([]int64, len(vals))
+ for i, v := range vals {
+ values[i] = v.v
+ }
+ return values
+}
+
+// Variance returns the variance of the values in the sample.
+func (s *ExpDecaySample) Variance() float64 {
+ return SampleVariance(s.Values())
+}
+
+// update samples a new value at a particular timestamp. This is a method all
+// its own to facilitate testing.
+func (s *ExpDecaySample) update(t time.Time, v int64) {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ s.count++
+ if s.values.Size() == s.reservoirSize {
+ s.values.Pop()
+ }
+ s.values.Push(expDecaySample{
+ k: math.Exp(t.Sub(s.t0).Seconds()*s.alpha) / rand.Float64(),
+ v: v,
+ })
+ if t.After(s.t1) {
+ values := s.values.Values()
+ t0 := s.t0
+ s.values.Clear()
+ s.t0 = t
+ s.t1 = s.t0.Add(rescaleThreshold)
+ for _, v := range values {
+ v.k = v.k * math.Exp(-s.alpha*s.t0.Sub(t0).Seconds())
+ s.values.Push(v)
+ }
+ }
+}
+
+// NilSample is a no-op Sample.
+type NilSample struct{}
+
+// Clear is a no-op.
+func (NilSample) Clear() {}
+
+// Count is a no-op.
+func (NilSample) Count() int64 { return 0 }
+
+// Max is a no-op.
+func (NilSample) Max() int64 { return 0 }
+
+// Mean is a no-op.
+func (NilSample) Mean() float64 { return 0.0 }
+
+// Min is a no-op.
+func (NilSample) Min() int64 { return 0 }
+
+// Percentile is a no-op.
+func (NilSample) Percentile(p float64) float64 { return 0.0 }
+
+// Percentiles is a no-op.
+func (NilSample) Percentiles(ps []float64) []float64 {
+ return make([]float64, len(ps))
+}
+
+// Size is a no-op.
+func (NilSample) Size() int { return 0 }
+
+// Sample is a no-op.
+func (NilSample) Snapshot() Sample { return NilSample{} }
+
+// StdDev is a no-op.
+func (NilSample) StdDev() float64 { return 0.0 }
+
+// Sum is a no-op.
+func (NilSample) Sum() int64 { return 0 }
+
+// Update is a no-op.
+func (NilSample) Update(v int64) {}
+
+// Values is a no-op.
+func (NilSample) Values() []int64 { return []int64{} }
+
+// Variance is a no-op.
+func (NilSample) Variance() float64 { return 0.0 }
+
+// SampleMax returns the maximum value of the slice of int64.
+func SampleMax(values []int64) int64 {
+ if 0 == len(values) {
+ return 0
+ }
+ var max int64 = math.MinInt64
+ for _, v := range values {
+ if max < v {
+ max = v
+ }
+ }
+ return max
+}
+
+// SampleMean returns the mean value of the slice of int64.
+func SampleMean(values []int64) float64 {
+ if 0 == len(values) {
+ return 0.0
+ }
+ return float64(SampleSum(values)) / float64(len(values))
+}
+
+// SampleMin returns the minimum value of the slice of int64.
+func SampleMin(values []int64) int64 {
+ if 0 == len(values) {
+ return 0
+ }
+ var min int64 = math.MaxInt64
+ for _, v := range values {
+ if min > v {
+ min = v
+ }
+ }
+ return min
+}
+
+// SamplePercentiles returns an arbitrary percentile of the slice of int64.
+func SamplePercentile(values int64Slice, p float64) float64 {
+ return SamplePercentiles(values, []float64{p})[0]
+}
+
+// SamplePercentiles returns a slice of arbitrary percentiles of the slice of
+// int64.
+func SamplePercentiles(values int64Slice, ps []float64) []float64 {
+ scores := make([]float64, len(ps))
+ size := len(values)
+ if size > 0 {
+ sort.Sort(values)
+ for i, p := range ps {
+ pos := p * float64(size+1)
+ if pos < 1.0 {
+ scores[i] = float64(values[0])
+ } else if pos >= float64(size) {
+ scores[i] = float64(values[size-1])
+ } else {
+ lower := float64(values[int(pos)-1])
+ upper := float64(values[int(pos)])
+ scores[i] = lower + (pos-math.Floor(pos))*(upper-lower)
+ }
+ }
+ }
+ return scores
+}
+
+// SampleSnapshot is a read-only copy of another Sample.
+type SampleSnapshot struct {
+ count int64
+ values []int64
+}
+
+// Clear panics.
+func (*SampleSnapshot) Clear() {
+ panic("Clear called on a SampleSnapshot")
+}
+
+// Count returns the count of inputs at the time the snapshot was taken.
+func (s *SampleSnapshot) Count() int64 { return s.count }
+
+// Max returns the maximal value at the time the snapshot was taken.
+func (s *SampleSnapshot) Max() int64 { return SampleMax(s.values) }
+
+// Mean returns the mean value at the time the snapshot was taken.
+func (s *SampleSnapshot) Mean() float64 { return SampleMean(s.values) }
+
+// Min returns the minimal value at the time the snapshot was taken.
+func (s *SampleSnapshot) Min() int64 { return SampleMin(s.values) }
+
+// Percentile returns an arbitrary percentile of values at the time the
+// snapshot was taken.
+func (s *SampleSnapshot) Percentile(p float64) float64 {
+ return SamplePercentile(s.values, p)
+}
+
+// Percentiles returns a slice of arbitrary percentiles of values at the time
+// the snapshot was taken.
+func (s *SampleSnapshot) Percentiles(ps []float64) []float64 {
+ return SamplePercentiles(s.values, ps)
+}
+
+// Size returns the size of the sample at the time the snapshot was taken.
+func (s *SampleSnapshot) Size() int { return len(s.values) }
+
+// Snapshot returns the snapshot.
+func (s *SampleSnapshot) Snapshot() Sample { return s }
+
+// StdDev returns the standard deviation of values at the time the snapshot was
+// taken.
+func (s *SampleSnapshot) StdDev() float64 { return SampleStdDev(s.values) }
+
+// Sum returns the sum of values at the time the snapshot was taken.
+func (s *SampleSnapshot) Sum() int64 { return SampleSum(s.values) }
+
+// Update panics.
+func (*SampleSnapshot) Update(int64) {
+ panic("Update called on a SampleSnapshot")
+}
+
+// Values returns a copy of the values in the sample.
+func (s *SampleSnapshot) Values() []int64 {
+ values := make([]int64, len(s.values))
+ copy(values, s.values)
+ return values
+}
+
+// Variance returns the variance of values at the time the snapshot was taken.
+func (s *SampleSnapshot) Variance() float64 { return SampleVariance(s.values) }
+
+// SampleStdDev returns the standard deviation of the slice of int64.
+func SampleStdDev(values []int64) float64 {
+ return math.Sqrt(SampleVariance(values))
+}
+
+// SampleSum returns the sum of the slice of int64.
+func SampleSum(values []int64) int64 {
+ var sum int64
+ for _, v := range values {
+ sum += v
+ }
+ return sum
+}
+
+// SampleVariance returns the variance of the slice of int64.
+func SampleVariance(values []int64) float64 {
+ if 0 == len(values) {
+ return 0.0
+ }
+ m := SampleMean(values)
+ var sum float64
+ for _, v := range values {
+ d := float64(v) - m
+ sum += d * d
+ }
+ return sum / float64(len(values))
+}
+
+// A uniform sample using Vitter's Algorithm R.
+//
+//
+type UniformSample struct {
+ count int64
+ mutex sync.Mutex
+ reservoirSize int
+ values []int64
+}
+
+// NewUniformSample constructs a new uniform sample with the given reservoir
+// size.
+func NewUniformSample(reservoirSize int) Sample {
+ return &UniformSample{
+ reservoirSize: reservoirSize,
+ values: make([]int64, 0, reservoirSize),
+ }
+}
+
+// Clear clears all samples.
+func (s *UniformSample) Clear() {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ s.count = 0
+ s.values = make([]int64, 0, s.reservoirSize)
+}
+
+// Count returns the number of samples recorded, which may exceed the
+// reservoir size.
+func (s *UniformSample) Count() int64 {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ return s.count
+}
+
+// Max returns the maximum value in the sample, which may not be the maximum
+// value ever to be part of the sample.
+func (s *UniformSample) Max() int64 {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ return SampleMax(s.values)
+}
+
+// Mean returns the mean of the values in the sample.
+func (s *UniformSample) Mean() float64 {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ return SampleMean(s.values)
+}
+
+// Min returns the minimum value in the sample, which may not be the minimum
+// value ever to be part of the sample.
+func (s *UniformSample) Min() int64 {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ return SampleMin(s.values)
+}
+
+// Percentile returns an arbitrary percentile of values in the sample.
+func (s *UniformSample) Percentile(p float64) float64 {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ return SamplePercentile(s.values, p)
+}
+
+// Percentiles returns a slice of arbitrary percentiles of values in the
+// sample.
+func (s *UniformSample) Percentiles(ps []float64) []float64 {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ return SamplePercentiles(s.values, ps)
+}
+
+// Size returns the size of the sample, which is at most the reservoir size.
+func (s *UniformSample) Size() int {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ return len(s.values)
+}
+
+// Snapshot returns a read-only copy of the sample.
+func (s *UniformSample) Snapshot() Sample {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ values := make([]int64, len(s.values))
+ copy(values, s.values)
+ return &SampleSnapshot{
+ count: s.count,
+ values: values,
+ }
+}
+
+// StdDev returns the standard deviation of the values in the sample.
+func (s *UniformSample) StdDev() float64 {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ return SampleStdDev(s.values)
+}
+
+// Sum returns the sum of the values in the sample.
+func (s *UniformSample) Sum() int64 {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ return SampleSum(s.values)
+}
+
+// Update samples a new value.
+func (s *UniformSample) Update(v int64) {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ s.count++
+ if len(s.values) < s.reservoirSize {
+ s.values = append(s.values, v)
+ } else {
+ r := rand.Int63n(s.count)
+ if r < int64(len(s.values)) {
+ s.values[int(r)] = v
+ }
+ }
+}
+
+// Values returns a copy of the values in the sample.
+func (s *UniformSample) Values() []int64 {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ values := make([]int64, len(s.values))
+ copy(values, s.values)
+ return values
+}
+
+// Variance returns the variance of the values in the sample.
+func (s *UniformSample) Variance() float64 {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ return SampleVariance(s.values)
+}
+
+// expDecaySample represents an individual sample in a heap.
+type expDecaySample struct {
+ k float64
+ v int64
+}
+
+func newExpDecaySampleHeap(reservoirSize int) *expDecaySampleHeap {
+ return &expDecaySampleHeap{make([]expDecaySample, 0, reservoirSize)}
+}
+
+// expDecaySampleHeap is a min-heap of expDecaySamples.
+// The internal implementation is copied from the standard library's container/heap
+type expDecaySampleHeap struct {
+ s []expDecaySample
+}
+
+func (h *expDecaySampleHeap) Clear() {
+ h.s = h.s[:0]
+}
+
+func (h *expDecaySampleHeap) Push(s expDecaySample) {
+ n := len(h.s)
+ h.s = h.s[0 : n+1]
+ h.s[n] = s
+ h.up(n)
+}
+
+func (h *expDecaySampleHeap) Pop() expDecaySample {
+ n := len(h.s) - 1
+ h.s[0], h.s[n] = h.s[n], h.s[0]
+ h.down(0, n)
+
+ n = len(h.s)
+ s := h.s[n-1]
+ h.s = h.s[0 : n-1]
+ return s
+}
+
+func (h *expDecaySampleHeap) Size() int {
+ return len(h.s)
+}
+
+func (h *expDecaySampleHeap) Values() []expDecaySample {
+ return h.s
+}
+
+func (h *expDecaySampleHeap) up(j int) {
+ for {
+ i := (j - 1) / 2 // parent
+ if i == j || !(h.s[j].k < h.s[i].k) {
+ break
+ }
+ h.s[i], h.s[j] = h.s[j], h.s[i]
+ j = i
+ }
+}
+
+func (h *expDecaySampleHeap) down(i, n int) {
+ for {
+ j1 := 2*i + 1
+ if j1 >= n || j1 < 0 { // j1 < 0 after int overflow
+ break
+ }
+ j := j1 // left child
+ if j2 := j1 + 1; j2 < n && !(h.s[j1].k < h.s[j2].k) {
+ j = j2 // = 2*i + 2 // right child
+ }
+ if !(h.s[j].k < h.s[i].k) {
+ break
+ }
+ h.s[i], h.s[j] = h.s[j], h.s[i]
+ i = j
+ }
+}
+
+type int64Slice []int64
+
+func (p int64Slice) Len() int { return len(p) }
+func (p int64Slice) Less(i, j int) bool { return p[i] < p[j] }
+func (p int64Slice) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
diff --git a/pkg/metrics/sample_test.go b/pkg/metrics/sample_test.go
new file mode 100644
index 00000000000..755a8cf0173
--- /dev/null
+++ b/pkg/metrics/sample_test.go
@@ -0,0 +1,367 @@
+// includes code from
+// https://raw.githubusercontent.com/rcrowley/go-metrics/master/sample.go
+// Copyright 2012 Richard Crowley. All rights reserved.
+
+package metrics
+
+import (
+ "math/rand"
+ "runtime"
+ "testing"
+ "time"
+)
+
+// Benchmark{Compute,Copy}{1000,1000000} demonstrate that, even for relatively
+// expensive computations like Variance, the cost of copying the Sample, as
+// approximated by a make and copy, is much greater than the cost of the
+// computation for small samples and only slightly less for large samples.
+func BenchmarkCompute1000(b *testing.B) {
+ s := make([]int64, 1000)
+ for i := 0; i < len(s); i++ {
+ s[i] = int64(i)
+ }
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ SampleVariance(s)
+ }
+}
+func BenchmarkCompute1000000(b *testing.B) {
+ s := make([]int64, 1000000)
+ for i := 0; i < len(s); i++ {
+ s[i] = int64(i)
+ }
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ SampleVariance(s)
+ }
+}
+func BenchmarkCopy1000(b *testing.B) {
+ s := make([]int64, 1000)
+ for i := 0; i < len(s); i++ {
+ s[i] = int64(i)
+ }
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ sCopy := make([]int64, len(s))
+ copy(sCopy, s)
+ }
+}
+func BenchmarkCopy1000000(b *testing.B) {
+ s := make([]int64, 1000000)
+ for i := 0; i < len(s); i++ {
+ s[i] = int64(i)
+ }
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ sCopy := make([]int64, len(s))
+ copy(sCopy, s)
+ }
+}
+
+func BenchmarkExpDecaySample257(b *testing.B) {
+ benchmarkSample(b, NewExpDecaySample(257, 0.015))
+}
+
+func BenchmarkExpDecaySample514(b *testing.B) {
+ benchmarkSample(b, NewExpDecaySample(514, 0.015))
+}
+
+func BenchmarkExpDecaySample1028(b *testing.B) {
+ benchmarkSample(b, NewExpDecaySample(1028, 0.015))
+}
+
+func BenchmarkUniformSample257(b *testing.B) {
+ benchmarkSample(b, NewUniformSample(257))
+}
+
+func BenchmarkUniformSample514(b *testing.B) {
+ benchmarkSample(b, NewUniformSample(514))
+}
+
+func BenchmarkUniformSample1028(b *testing.B) {
+ benchmarkSample(b, NewUniformSample(1028))
+}
+
+func TestExpDecaySample10(t *testing.T) {
+ rand.Seed(1)
+ s := NewExpDecaySample(100, 0.99)
+ for i := 0; i < 10; i++ {
+ s.Update(int64(i))
+ }
+ if size := s.Count(); 10 != size {
+ t.Errorf("s.Count(): 10 != %v\n", size)
+ }
+ if size := s.Size(); 10 != size {
+ t.Errorf("s.Size(): 10 != %v\n", size)
+ }
+ if l := len(s.Values()); 10 != l {
+ t.Errorf("len(s.Values()): 10 != %v\n", l)
+ }
+ for _, v := range s.Values() {
+ if v > 10 || v < 0 {
+ t.Errorf("out of range [0, 10): %v\n", v)
+ }
+ }
+}
+
+func TestExpDecaySample100(t *testing.T) {
+ rand.Seed(1)
+ s := NewExpDecaySample(1000, 0.01)
+ for i := 0; i < 100; i++ {
+ s.Update(int64(i))
+ }
+ if size := s.Count(); 100 != size {
+ t.Errorf("s.Count(): 100 != %v\n", size)
+ }
+ if size := s.Size(); 100 != size {
+ t.Errorf("s.Size(): 100 != %v\n", size)
+ }
+ if l := len(s.Values()); 100 != l {
+ t.Errorf("len(s.Values()): 100 != %v\n", l)
+ }
+ for _, v := range s.Values() {
+ if v > 100 || v < 0 {
+ t.Errorf("out of range [0, 100): %v\n", v)
+ }
+ }
+}
+
+func TestExpDecaySample1000(t *testing.T) {
+ rand.Seed(1)
+ s := NewExpDecaySample(100, 0.99)
+ for i := 0; i < 1000; i++ {
+ s.Update(int64(i))
+ }
+ if size := s.Count(); 1000 != size {
+ t.Errorf("s.Count(): 1000 != %v\n", size)
+ }
+ if size := s.Size(); 100 != size {
+ t.Errorf("s.Size(): 100 != %v\n", size)
+ }
+ if l := len(s.Values()); 100 != l {
+ t.Errorf("len(s.Values()): 100 != %v\n", l)
+ }
+ for _, v := range s.Values() {
+ if v > 1000 || v < 0 {
+ t.Errorf("out of range [0, 1000): %v\n", v)
+ }
+ }
+}
+
+// This test makes sure that the sample's priority is not amplified by using
+// nanosecond duration since start rather than second duration since start.
+// The priority becomes +Inf quickly after starting if this is done,
+// effectively freezing the set of samples until a rescale step happens.
+func TestExpDecaySampleNanosecondRegression(t *testing.T) {
+ rand.Seed(1)
+ s := NewExpDecaySample(100, 0.99)
+ for i := 0; i < 100; i++ {
+ s.Update(10)
+ }
+ time.Sleep(1 * time.Millisecond)
+ for i := 0; i < 100; i++ {
+ s.Update(20)
+ }
+ v := s.Values()
+ avg := float64(0)
+ for i := 0; i < len(v); i++ {
+ avg += float64(v[i])
+ }
+ avg /= float64(len(v))
+ if avg > 16 || avg < 14 {
+ t.Errorf("out of range [14, 16]: %v\n", avg)
+ }
+}
+
+func TestExpDecaySampleRescale(t *testing.T) {
+ s := NewExpDecaySample(2, 0.001).(*ExpDecaySample)
+ s.update(time.Now(), 1)
+ s.update(time.Now().Add(time.Hour+time.Microsecond), 1)
+ for _, v := range s.values.Values() {
+ if v.k == 0.0 {
+ t.Fatal("v.k == 0.0")
+ }
+ }
+}
+
+func TestExpDecaySampleSnapshot(t *testing.T) {
+ now := time.Now()
+ rand.Seed(1)
+ s := NewExpDecaySample(100, 0.99)
+ for i := 1; i <= 10000; i++ {
+ s.(*ExpDecaySample).update(now.Add(time.Duration(i)), int64(i))
+ }
+ snapshot := s.Snapshot()
+ s.Update(1)
+ testExpDecaySampleStatistics(t, snapshot)
+}
+
+func TestExpDecaySampleStatistics(t *testing.T) {
+ now := time.Now()
+ rand.Seed(1)
+ s := NewExpDecaySample(100, 0.99)
+ for i := 1; i <= 10000; i++ {
+ s.(*ExpDecaySample).update(now.Add(time.Duration(i)), int64(i))
+ }
+ testExpDecaySampleStatistics(t, s)
+}
+
+func TestUniformSample(t *testing.T) {
+ rand.Seed(1)
+ s := NewUniformSample(100)
+ for i := 0; i < 1000; i++ {
+ s.Update(int64(i))
+ }
+ if size := s.Count(); 1000 != size {
+ t.Errorf("s.Count(): 1000 != %v\n", size)
+ }
+ if size := s.Size(); 100 != size {
+ t.Errorf("s.Size(): 100 != %v\n", size)
+ }
+ if l := len(s.Values()); 100 != l {
+ t.Errorf("len(s.Values()): 100 != %v\n", l)
+ }
+ for _, v := range s.Values() {
+ if v > 1000 || v < 0 {
+ t.Errorf("out of range [0, 100): %v\n", v)
+ }
+ }
+}
+
+func TestUniformSampleIncludesTail(t *testing.T) {
+ rand.Seed(1)
+ s := NewUniformSample(100)
+ max := 100
+ for i := 0; i < max; i++ {
+ s.Update(int64(i))
+ }
+ v := s.Values()
+ sum := 0
+ exp := (max - 1) * max / 2
+ for i := 0; i < len(v); i++ {
+ sum += int(v[i])
+ }
+ if exp != sum {
+ t.Errorf("sum: %v != %v\n", exp, sum)
+ }
+}
+
+func TestUniformSampleSnapshot(t *testing.T) {
+ s := NewUniformSample(100)
+ for i := 1; i <= 10000; i++ {
+ s.Update(int64(i))
+ }
+ snapshot := s.Snapshot()
+ s.Update(1)
+ testUniformSampleStatistics(t, snapshot)
+}
+
+func TestUniformSampleStatistics(t *testing.T) {
+ rand.Seed(1)
+ s := NewUniformSample(100)
+ for i := 1; i <= 10000; i++ {
+ s.Update(int64(i))
+ }
+ testUniformSampleStatistics(t, s)
+}
+
+func benchmarkSample(b *testing.B, s Sample) {
+ var memStats runtime.MemStats
+ runtime.ReadMemStats(&memStats)
+ pauseTotalNs := memStats.PauseTotalNs
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ s.Update(1)
+ }
+ b.StopTimer()
+ runtime.GC()
+ runtime.ReadMemStats(&memStats)
+ b.Logf("GC cost: %d ns/op", int(memStats.PauseTotalNs-pauseTotalNs)/b.N)
+}
+
+func testExpDecaySampleStatistics(t *testing.T, s Sample) {
+ if count := s.Count(); 10000 != count {
+ t.Errorf("s.Count(): 10000 != %v\n", count)
+ }
+ if min := s.Min(); 107 != min {
+ t.Errorf("s.Min(): 107 != %v\n", min)
+ }
+ if max := s.Max(); 10000 != max {
+ t.Errorf("s.Max(): 10000 != %v\n", max)
+ }
+ if mean := s.Mean(); 4965.98 != mean {
+ t.Errorf("s.Mean(): 4965.98 != %v\n", mean)
+ }
+ if stdDev := s.StdDev(); 2959.825156930727 != stdDev {
+ t.Errorf("s.StdDev(): 2959.825156930727 != %v\n", stdDev)
+ }
+ ps := s.Percentiles([]float64{0.5, 0.75, 0.99})
+ if 4615 != ps[0] {
+ t.Errorf("median: 4615 != %v\n", ps[0])
+ }
+ if 7672 != ps[1] {
+ t.Errorf("75th percentile: 7672 != %v\n", ps[1])
+ }
+ if 9998.99 != ps[2] {
+ t.Errorf("99th percentile: 9998.99 != %v\n", ps[2])
+ }
+}
+
+func testUniformSampleStatistics(t *testing.T, s Sample) {
+ if count := s.Count(); 10000 != count {
+ t.Errorf("s.Count(): 10000 != %v\n", count)
+ }
+ if min := s.Min(); 37 != min {
+ t.Errorf("s.Min(): 37 != %v\n", min)
+ }
+ if max := s.Max(); 9989 != max {
+ t.Errorf("s.Max(): 9989 != %v\n", max)
+ }
+ if mean := s.Mean(); 4748.14 != mean {
+ t.Errorf("s.Mean(): 4748.14 != %v\n", mean)
+ }
+ if stdDev := s.StdDev(); 2826.684117548333 != stdDev {
+ t.Errorf("s.StdDev(): 2826.684117548333 != %v\n", stdDev)
+ }
+ ps := s.Percentiles([]float64{0.5, 0.75, 0.99})
+ if 4599 != ps[0] {
+ t.Errorf("median: 4599 != %v\n", ps[0])
+ }
+ if 7380.5 != ps[1] {
+ t.Errorf("75th percentile: 7380.5 != %v\n", ps[1])
+ }
+ if 9986.429999999998 != ps[2] {
+ t.Errorf("99th percentile: 9986.429999999998 != %v\n", ps[2])
+ }
+}
+
+// TestUniformSampleConcurrentUpdateCount would expose data race problems with
+// concurrent Update and Count calls on Sample when test is called with -race
+// argument
+func TestUniformSampleConcurrentUpdateCount(t *testing.T) {
+ if testing.Short() {
+ t.Skip("skipping in short mode")
+ }
+ s := NewUniformSample(100)
+ for i := 0; i < 100; i++ {
+ s.Update(int64(i))
+ }
+ quit := make(chan struct{})
+ go func() {
+ t := time.NewTicker(10 * time.Millisecond)
+ for {
+ select {
+ case <-t.C:
+ s.Update(rand.Int63())
+ case <-quit:
+ t.Stop()
+ return
+ }
+ }
+ }()
+ for i := 0; i < 1000; i++ {
+ s.Count()
+ time.Sleep(5 * time.Millisecond)
+ }
+ quit <- struct{}{}
+}
diff --git a/pkg/metrics/settings.go b/pkg/metrics/settings.go
new file mode 100644
index 00000000000..691bf6b6e73
--- /dev/null
+++ b/pkg/metrics/settings.go
@@ -0,0 +1,43 @@
+package metrics
+
+import "github.com/grafana/grafana/pkg/setting"
+
+type MetricPublisher interface {
+ Publish(metrics []Metric)
+}
+
+type MetricSettings struct {
+ Enabled bool
+ IntervalSeconds int64
+
+ Publishers []MetricPublisher
+}
+
+func readSettings() *MetricSettings {
+ var settings = &MetricSettings{
+ Enabled: false,
+ Publishers: make([]MetricPublisher, 0),
+ }
+
+ var section, err = setting.Cfg.GetSection("metrics")
+ if err != nil {
+ metricsLogger.Crit("Unable to find metrics config section", "error", err)
+ return nil
+ }
+
+ settings.Enabled = section.Key("enabled").MustBool(false)
+ settings.IntervalSeconds = section.Key("interval_seconds").MustInt64(10)
+
+ if !settings.Enabled {
+ return settings
+ }
+
+ if graphitePublisher, err := CreateGraphitePublisher(); err != nil {
+ metricsLogger.Error("Failed to init Graphite metric publisher", "error", err)
+ } else if graphitePublisher != nil {
+ metricsLogger.Info("Metrics publisher initialized", "type", "graphite")
+ settings.Publishers = append(settings.Publishers, graphitePublisher)
+ }
+
+ return settings
+}
diff --git a/pkg/metrics/timer.go b/pkg/metrics/timer.go
new file mode 100644
index 00000000000..61c3bf9533d
--- /dev/null
+++ b/pkg/metrics/timer.go
@@ -0,0 +1,310 @@
+// includes code from
+// https://raw.githubusercontent.com/rcrowley/go-metrics/master/sample.go
+// Copyright 2012 Richard Crowley. All rights reserved.
+
+package metrics
+
+import (
+ "sync"
+ "time"
+)
+
+// Timers capture the duration and rate of events.
+type Timer interface {
+ Metric
+
+ Count() int64
+ Max() int64
+ Mean() float64
+ Min() int64
+ Percentile(float64) float64
+ Percentiles([]float64) []float64
+ Rate1() float64
+ Rate5() float64
+ Rate15() float64
+ RateMean() float64
+ StdDev() float64
+ Sum() int64
+ Time(func())
+ Update(time.Duration)
+ UpdateSince(time.Time)
+ Variance() float64
+}
+
+// NewCustomTimer constructs a new StandardTimer from a Histogram and a Meter.
+func NewCustomTimer(meta *MetricMeta, h Histogram, m Meter) Timer {
+ if UseNilMetrics {
+ return NilTimer{}
+ }
+ return &StandardTimer{
+ MetricMeta: meta,
+ histogram: h,
+ meter: m,
+ }
+}
+
+// NewTimer constructs a new StandardTimer using an exponentially-decaying
+// sample with the same reservoir size and alpha as UNIX load averages.
+func NewTimer(meta *MetricMeta) Timer {
+ if UseNilMetrics {
+ return NilTimer{}
+ }
+ return &StandardTimer{
+ MetricMeta: meta,
+ histogram: NewHistogram(meta, NewExpDecaySample(1028, 0.015)),
+ meter: NewMeter(meta),
+ }
+}
+
+func RegTimer(name string, tagStrings ...string) Timer {
+ tr := NewTimer(NewMetricMeta(name, tagStrings))
+ MetricStats.Register(tr)
+ return tr
+}
+
+// NilTimer is a no-op Timer.
+type NilTimer struct {
+ *MetricMeta
+ h Histogram
+ m Meter
+}
+
+// Count is a no-op.
+func (NilTimer) Count() int64 { return 0 }
+
+// Max is a no-op.
+func (NilTimer) Max() int64 { return 0 }
+
+// Mean is a no-op.
+func (NilTimer) Mean() float64 { return 0.0 }
+
+// Min is a no-op.
+func (NilTimer) Min() int64 { return 0 }
+
+// Percentile is a no-op.
+func (NilTimer) Percentile(p float64) float64 { return 0.0 }
+
+// Percentiles is a no-op.
+func (NilTimer) Percentiles(ps []float64) []float64 {
+ return make([]float64, len(ps))
+}
+
+// Rate1 is a no-op.
+func (NilTimer) Rate1() float64 { return 0.0 }
+
+// Rate5 is a no-op.
+func (NilTimer) Rate5() float64 { return 0.0 }
+
+// Rate15 is a no-op.
+func (NilTimer) Rate15() float64 { return 0.0 }
+
+// RateMean is a no-op.
+func (NilTimer) RateMean() float64 { return 0.0 }
+
+// Snapshot is a no-op.
+func (n NilTimer) Snapshot() Metric { return n }
+
+// StdDev is a no-op.
+func (NilTimer) StdDev() float64 { return 0.0 }
+
+// Sum is a no-op.
+func (NilTimer) Sum() int64 { return 0 }
+
+// Time is a no-op.
+func (NilTimer) Time(func()) {}
+
+// Update is a no-op.
+func (NilTimer) Update(time.Duration) {}
+
+// UpdateSince is a no-op.
+func (NilTimer) UpdateSince(time.Time) {}
+
+// Variance is a no-op.
+func (NilTimer) Variance() float64 { return 0.0 }
+
+// StandardTimer is the standard implementation of a Timer and uses a Histogram
+// and Meter.
+type StandardTimer struct {
+ *MetricMeta
+ histogram Histogram
+ meter Meter
+ mutex sync.Mutex
+}
+
+// Count returns the number of events recorded.
+func (t *StandardTimer) Count() int64 {
+ return t.histogram.Count()
+}
+
+// Max returns the maximum value in the sample.
+func (t *StandardTimer) Max() int64 {
+ return t.histogram.Max()
+}
+
+// Mean returns the mean of the values in the sample.
+func (t *StandardTimer) Mean() float64 {
+ return t.histogram.Mean()
+}
+
+// Min returns the minimum value in the sample.
+func (t *StandardTimer) Min() int64 {
+ return t.histogram.Min()
+}
+
+// Percentile returns an arbitrary percentile of the values in the sample.
+func (t *StandardTimer) Percentile(p float64) float64 {
+ return t.histogram.Percentile(p)
+}
+
+// Percentiles returns a slice of arbitrary percentiles of the values in the
+// sample.
+func (t *StandardTimer) Percentiles(ps []float64) []float64 {
+ return t.histogram.Percentiles(ps)
+}
+
+// Rate1 returns the one-minute moving average rate of events per second.
+func (t *StandardTimer) Rate1() float64 {
+ return t.meter.Rate1()
+}
+
+// Rate5 returns the five-minute moving average rate of events per second.
+func (t *StandardTimer) Rate5() float64 {
+ return t.meter.Rate5()
+}
+
+// Rate15 returns the fifteen-minute moving average rate of events per second.
+func (t *StandardTimer) Rate15() float64 {
+ return t.meter.Rate15()
+}
+
+// RateMean returns the meter's mean rate of events per second.
+func (t *StandardTimer) RateMean() float64 {
+ return t.meter.RateMean()
+}
+
+// Snapshot returns a read-only copy of the timer.
+func (t *StandardTimer) Snapshot() Metric {
+ t.mutex.Lock()
+ defer t.mutex.Unlock()
+ return &TimerSnapshot{
+ MetricMeta: t.MetricMeta,
+ histogram: t.histogram.Snapshot().(*HistogramSnapshot),
+ meter: t.meter.Snapshot().(*MeterSnapshot),
+ }
+}
+
+// StdDev returns the standard deviation of the values in the sample.
+func (t *StandardTimer) StdDev() float64 {
+ return t.histogram.StdDev()
+}
+
+// Sum returns the sum in the sample.
+func (t *StandardTimer) Sum() int64 {
+ return t.histogram.Sum()
+}
+
+// Record the duration of the execution of the given function.
+func (t *StandardTimer) Time(f func()) {
+ ts := time.Now()
+ f()
+ t.Update(time.Since(ts))
+}
+
+// Record the duration of an event.
+func (t *StandardTimer) Update(d time.Duration) {
+ t.mutex.Lock()
+ defer t.mutex.Unlock()
+ t.histogram.Update(int64(d))
+ t.meter.Mark(1)
+}
+
+// Record the duration of an event that started at a time and ends now.
+func (t *StandardTimer) UpdateSince(ts time.Time) {
+ t.mutex.Lock()
+ defer t.mutex.Unlock()
+ sinceMs := time.Since(ts) / time.Millisecond
+ t.histogram.Update(int64(sinceMs))
+ t.meter.Mark(1)
+}
+
+// Variance returns the variance of the values in the sample.
+func (t *StandardTimer) Variance() float64 {
+ return t.histogram.Variance()
+}
+
+// TimerSnapshot is a read-only copy of another Timer.
+type TimerSnapshot struct {
+ *MetricMeta
+ histogram *HistogramSnapshot
+ meter *MeterSnapshot
+}
+
+// Count returns the number of events recorded at the time the snapshot was
+// taken.
+func (t *TimerSnapshot) Count() int64 { return t.histogram.Count() }
+
+// Max returns the maximum value at the time the snapshot was taken.
+func (t *TimerSnapshot) Max() int64 { return t.histogram.Max() }
+
+// Mean returns the mean value at the time the snapshot was taken.
+func (t *TimerSnapshot) Mean() float64 { return t.histogram.Mean() }
+
+// Min returns the minimum value at the time the snapshot was taken.
+func (t *TimerSnapshot) Min() int64 { return t.histogram.Min() }
+
+// Percentile returns an arbitrary percentile of sampled values at the time the
+// snapshot was taken.
+func (t *TimerSnapshot) Percentile(p float64) float64 {
+ return t.histogram.Percentile(p)
+}
+
+// Percentiles returns a slice of arbitrary percentiles of sampled values at
+// the time the snapshot was taken.
+func (t *TimerSnapshot) Percentiles(ps []float64) []float64 {
+ return t.histogram.Percentiles(ps)
+}
+
+// Rate1 returns the one-minute moving average rate of events per second at the
+// time the snapshot was taken.
+func (t *TimerSnapshot) Rate1() float64 { return t.meter.Rate1() }
+
+// Rate5 returns the five-minute moving average rate of events per second at
+// the time the snapshot was taken.
+func (t *TimerSnapshot) Rate5() float64 { return t.meter.Rate5() }
+
+// Rate15 returns the fifteen-minute moving average rate of events per second
+// at the time the snapshot was taken.
+func (t *TimerSnapshot) Rate15() float64 { return t.meter.Rate15() }
+
+// RateMean returns the meter's mean rate of events per second at the time the
+// snapshot was taken.
+func (t *TimerSnapshot) RateMean() float64 { return t.meter.RateMean() }
+
+// Snapshot returns the snapshot.
+func (t *TimerSnapshot) Snapshot() Metric { return t }
+
+// StdDev returns the standard deviation of the values at the time the snapshot
+// was taken.
+func (t *TimerSnapshot) StdDev() float64 { return t.histogram.StdDev() }
+
+// Sum returns the sum at the time the snapshot was taken.
+func (t *TimerSnapshot) Sum() int64 { return t.histogram.Sum() }
+
+// Time panics.
+func (*TimerSnapshot) Time(func()) {
+ panic("Time called on a TimerSnapshot")
+}
+
+// Update panics.
+func (*TimerSnapshot) Update(time.Duration) {
+ panic("Update called on a TimerSnapshot")
+}
+
+// UpdateSince panics.
+func (*TimerSnapshot) UpdateSince(time.Time) {
+ panic("UpdateSince called on a TimerSnapshot")
+}
+
+// Variance returns the variance of the values at the time the snapshot was
+// taken.
+func (t *TimerSnapshot) Variance() float64 { return t.histogram.Variance() }
diff --git a/pkg/middleware/auth_proxy.go b/pkg/middleware/auth_proxy.go
index 648c3319305..e02e31f9152 100644
--- a/pkg/middleware/auth_proxy.go
+++ b/pkg/middleware/auth_proxy.go
@@ -1,8 +1,14 @@
package middleware
import (
+ "errors"
+ "fmt"
+ "strings"
+ "time"
+
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/login"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
)
@@ -17,6 +23,12 @@ func initContextWithAuthProxy(ctx *Context) bool {
return false
}
+ // if auth proxy ip(s) defined, check if request comes from one of those
+ if err := checkAuthenticationProxy(ctx, proxyHeaderValue); err != nil {
+ ctx.Handle(407, "Proxy authentication required", err)
+ return true
+ }
+
query := getSignedInUserQueryForProxyAuth(proxyHeaderValue)
if err := bus.Dispatch(query); err != nil {
if err != m.ErrUserNotFound {
@@ -26,6 +38,10 @@ func initContextWithAuthProxy(ctx *Context) bool {
if setting.AuthProxyAutoSignUp {
cmd := getCreateUserCommandForProxyAuth(proxyHeaderValue)
+ if setting.LdapEnabled {
+ cmd.SkipOrgSetup = true
+ }
+
if err := bus.Dispatch(cmd); err != nil {
ctx.Handle(500, "Failed to create user specified in auth proxy header", err)
return true
@@ -46,6 +62,30 @@ func initContextWithAuthProxy(ctx *Context) bool {
return false
}
+ // Make sure that we cannot share a session between different users!
+ if getRequestUserId(ctx) > 0 && getRequestUserId(ctx) != query.Result.UserId {
+ // remove session
+ if err := ctx.Session.Destory(ctx); err != nil {
+ log.Error(3, "Failed to destory session, err")
+ }
+
+ // initialize a new session
+ if err := ctx.Session.Start(ctx); err != nil {
+ log.Error(3, "Failed to start session", err)
+ }
+ }
+
+ // When ldap is enabled, sync userinfo and org roles
+ if err := syncGrafanaUserWithLdapUser(ctx, query); err != nil {
+ if err == login.ErrInvalidCredentials {
+ ctx.Handle(500, "Unable to authenticate user", err)
+ return false
+ }
+
+ ctx.Handle(500, "Failed to sync user", err)
+ return false
+ }
+
ctx.SignedInUser = query.Result
ctx.IsSignedIn = true
ctx.Session.Set(SESS_KEY_USERID, ctx.UserId)
@@ -53,6 +93,56 @@ func initContextWithAuthProxy(ctx *Context) bool {
return true
}
+var syncGrafanaUserWithLdapUser = func(ctx *Context, query *m.GetSignedInUserQuery) error {
+ if setting.LdapEnabled {
+ expireEpoch := time.Now().Add(time.Duration(-setting.AuthProxyLdapSyncTtl) * time.Minute).Unix()
+
+ var lastLdapSync int64
+ if lastLdapSyncInSession := ctx.Session.Get(SESS_KEY_LASTLDAPSYNC); lastLdapSyncInSession != nil {
+ lastLdapSync = lastLdapSyncInSession.(int64)
+ }
+
+ if lastLdapSync < expireEpoch {
+ ldapCfg := login.LdapCfg
+
+ for _, server := range ldapCfg.Servers {
+ auther := login.NewLdapAuthenticator(server)
+ if err := auther.SyncSignedInUser(query.Result); err != nil {
+ return err
+ }
+ }
+
+ ctx.Session.Set(SESS_KEY_LASTLDAPSYNC, time.Now().Unix())
+ }
+ }
+
+ return nil
+}
+
+func checkAuthenticationProxy(ctx *Context, proxyHeaderValue string) error {
+ if len(strings.TrimSpace(setting.AuthProxyWhitelist)) > 0 {
+ proxies := strings.Split(setting.AuthProxyWhitelist, ",")
+ remoteAddrSplit := strings.Split(ctx.Req.RemoteAddr, ":")
+ sourceIP := remoteAddrSplit[0]
+
+ found := false
+ for _, proxyIP := range proxies {
+ if sourceIP == strings.TrimSpace(proxyIP) {
+ found = true
+ break
+ }
+ }
+
+ if !found {
+ msg := fmt.Sprintf("Request for user (%s) is not from the authentication proxy", proxyHeaderValue)
+ err := errors.New(msg)
+ return err
+ }
+ }
+
+ return nil
+}
+
func getSignedInUserQueryForProxyAuth(headerVal string) *m.GetSignedInUserQuery {
query := m.GetSignedInUserQuery{}
if setting.AuthProxyHeaderProperty == "username" {
diff --git a/pkg/middleware/auth_proxy_test.go b/pkg/middleware/auth_proxy_test.go
new file mode 100644
index 00000000000..cc9253b6a77
--- /dev/null
+++ b/pkg/middleware/auth_proxy_test.go
@@ -0,0 +1,123 @@
+package middleware
+
+import (
+ "testing"
+ "time"
+
+ "github.com/grafana/grafana/pkg/login"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestAuthProxyWithLdapEnabled(t *testing.T) {
+ Convey("When calling sync grafana user with ldap user", t, func() {
+
+ setting.LdapEnabled = true
+ setting.AuthProxyLdapSyncTtl = 60
+
+ servers := []*login.LdapServerConf{{Host: "127.0.0.1"}}
+ login.LdapCfg = login.LdapConfig{Servers: servers}
+ mockLdapAuther := mockLdapAuthenticator{}
+
+ login.NewLdapAuthenticator = func(server *login.LdapServerConf) login.ILdapAuther {
+ return &mockLdapAuther
+ }
+
+ signedInUser := m.SignedInUser{}
+ query := m.GetSignedInUserQuery{Result: &signedInUser}
+
+ Convey("When session variable lastLdapSync not set, call syncSignedInUser and set lastLdapSync", func() {
+ // arrange
+ session := mockSession{}
+ ctx := Context{Session: &session}
+ So(session.Get(SESS_KEY_LASTLDAPSYNC), ShouldBeNil)
+
+ // act
+ syncGrafanaUserWithLdapUser(&ctx, &query)
+
+ // assert
+ So(mockLdapAuther.syncSignedInUserCalled, ShouldBeTrue)
+ So(session.Get(SESS_KEY_LASTLDAPSYNC), ShouldBeGreaterThan, 0)
+ })
+
+ Convey("When session variable not expired, don't sync and don't change session var", func() {
+ // arrange
+ session := mockSession{}
+ ctx := Context{Session: &session}
+ now := time.Now().Unix()
+ session.Set(SESS_KEY_LASTLDAPSYNC, now)
+
+ // act
+ syncGrafanaUserWithLdapUser(&ctx, &query)
+
+ // assert
+ So(session.Get(SESS_KEY_LASTLDAPSYNC), ShouldEqual, now)
+ So(mockLdapAuther.syncSignedInUserCalled, ShouldBeFalse)
+ })
+
+ Convey("When lastldapsync is expired, session variable should be updated", func() {
+ // arrange
+ session := mockSession{}
+ ctx := Context{Session: &session}
+ expiredTime := time.Now().Add(time.Duration(-120) * time.Minute).Unix()
+ session.Set(SESS_KEY_LASTLDAPSYNC, expiredTime)
+
+ // act
+ syncGrafanaUserWithLdapUser(&ctx, &query)
+
+ // assert
+ So(session.Get(SESS_KEY_LASTLDAPSYNC), ShouldBeGreaterThan, expiredTime)
+ So(mockLdapAuther.syncSignedInUserCalled, ShouldBeTrue)
+ })
+ })
+}
+
+type mockSession struct {
+ value interface{}
+}
+
+func (s *mockSession) Start(c *Context) error {
+ return nil
+}
+
+func (s *mockSession) Set(k interface{}, v interface{}) error {
+ s.value = v
+ return nil
+}
+
+func (s *mockSession) Get(k interface{}) interface{} {
+ return s.value
+}
+
+func (s *mockSession) ID() string {
+ return ""
+}
+
+func (s *mockSession) Release() error {
+ return nil
+}
+
+func (s *mockSession) Destory(c *Context) error {
+ return nil
+}
+
+type mockLdapAuthenticator struct {
+ syncSignedInUserCalled bool
+}
+
+func (a *mockLdapAuthenticator) Login(query *login.LoginUserQuery) error {
+ return nil
+}
+
+func (a *mockLdapAuthenticator) SyncSignedInUser(signedInUser *m.SignedInUser) error {
+ a.syncSignedInUserCalled = true
+ return nil
+}
+
+func (a *mockLdapAuthenticator) GetGrafanaUserFor(ldapUser *login.LdapUserInfo) (*m.User, error) {
+ return nil, nil
+}
+func (a *mockLdapAuthenticator) SyncOrgRoles(user *m.User, ldapUser *login.LdapUserInfo) error {
+ return nil
+}
diff --git a/pkg/middleware/logger.go b/pkg/middleware/logger.go
index 4cb8acc6354..9bed7cbe16b 100644
--- a/pkg/middleware/logger.go
+++ b/pkg/middleware/logger.go
@@ -16,11 +16,10 @@
package middleware
import (
- "fmt"
"net/http"
"time"
- "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/setting"
"gopkg.in/macaron.v1"
)
@@ -28,29 +27,32 @@ import (
func Logger() macaron.Handler {
return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) {
start := time.Now()
-
- uname := c.GetCookie(setting.CookieUserName)
- if len(uname) == 0 {
- uname = "-"
- }
+ c.Data["perfmon.start"] = start
rw := res.(macaron.ResponseWriter)
c.Next()
- content := fmt.Sprintf("Completed %s %s \"%s %s %s\" %v %s %d bytes in %dus", c.RemoteAddr(), uname, req.Method, req.URL.Path, req.Proto, rw.Status(), http.StatusText(rw.Status()), rw.Size(), time.Since(start)/time.Microsecond)
+ timeTakenMs := time.Since(start) / time.Millisecond
- switch rw.Status() {
- case 200, 304:
- content = fmt.Sprintf("%s", content)
+ if timer, ok := c.Data["perfmon.timer"]; ok {
+ timerTyped := timer.(metrics.Timer)
+ timerTyped.Update(timeTakenMs)
+ }
+
+ status := rw.Status()
+ if status == 200 || status == 304 {
if !setting.RouterLogging {
return
}
- case 404:
- content = fmt.Sprintf("%s", content)
- case 500:
- content = fmt.Sprintf("%s", content)
}
- log.Info(content)
+ if ctx, ok := c.Data["ctx"]; ok {
+ ctxTyped := ctx.(*Context)
+ if status == 500 {
+ ctxTyped.Logger.Error("Request Completed", "method", req.Method, "path", req.URL.Path, "status", status, "remote_addr", c.RemoteAddr(), "time_ms", timeTakenMs, "size", rw.Size())
+ } else {
+ ctxTyped.Logger.Info("Request Completed", "method", req.Method, "path", req.URL.Path, "status", status, "remote_addr", c.RemoteAddr(), "time_ms", timeTakenMs, "size", rw.Size())
+ }
+ }
}
}
diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go
index 7a51fd4e8d8..4b59fada62e 100644
--- a/pkg/middleware/middleware.go
+++ b/pkg/middleware/middleware.go
@@ -9,6 +9,7 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/apikeygen"
"github.com/grafana/grafana/pkg/log"
+ l "github.com/grafana/grafana/pkg/login"
"github.com/grafana/grafana/pkg/metrics"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
@@ -22,7 +23,9 @@ type Context struct {
Session SessionStore
IsSignedIn bool
+ IsRenderCall bool
AllowAnonymous bool
+ Logger log.Logger
}
func GetContextHandler() macaron.Handler {
@@ -33,6 +36,7 @@ func GetContextHandler() macaron.Handler {
Session: GetSession(),
IsSignedIn: false,
AllowAnonymous: false,
+ Logger: log.New("context"),
}
// the order in which these are tested are important
@@ -40,14 +44,17 @@ func GetContextHandler() macaron.Handler {
// then init session and look for userId in session
// then look for api key in session (special case for render calls via api)
// then test if anonymous access is enabled
- if initContextWithApiKey(ctx) ||
+ if initContextWithRenderAuth(ctx) ||
+ initContextWithApiKey(ctx) ||
initContextWithBasicAuth(ctx) ||
initContextWithAuthProxy(ctx) ||
initContextWithUserSessionCookie(ctx) ||
- initContextWithApiKeyFromSession(ctx) ||
initContextWithAnonymousUser(ctx) {
}
+ ctx.Logger = log.New("context", "userId", ctx.UserId, "orgId", ctx.OrgId, "uname", ctx.Login)
+ ctx.Data["ctx"] = ctx
+
c.Map(ctx)
}
}
@@ -75,7 +82,7 @@ func initContextWithAnonymousUser(ctx *Context) bool {
func initContextWithUserSessionCookie(ctx *Context) bool {
// initialize session
if err := ctx.Session.Start(ctx); err != nil {
- log.Error(3, "Failed to start session", err)
+ ctx.Logger.Error("Failed to start session", "error", err)
return false
}
@@ -86,7 +93,7 @@ func initContextWithUserSessionCookie(ctx *Context) bool {
query := m.GetSignedInUserQuery{UserId: userId}
if err := bus.Dispatch(&query); err != nil {
- log.Error(3, "Failed to get user with id %v", userId)
+ ctx.Logger.Error("Failed to get user with id", "userId", userId)
return false
} else {
ctx.SignedInUser = query.Result
@@ -131,6 +138,7 @@ func initContextWithApiKey(ctx *Context) bool {
}
func initContextWithBasicAuth(ctx *Context) bool {
+
if !setting.BasicAuthEnabled {
return false
}
@@ -154,9 +162,9 @@ func initContextWithBasicAuth(ctx *Context) bool {
user := loginQuery.Result
- // validate password
- if util.EncodePassword(password, user.Salt) != user.Password {
- ctx.JsonApiErr(401, "Invalid username or password", nil)
+ loginUserQuery := l.LoginUserQuery{Username: username, Password: password, User: user}
+ if err := bus.Dispatch(&loginUserQuery); err != nil {
+ ctx.JsonApiErr(401, "Invalid username or password", err)
return true
}
@@ -171,56 +179,23 @@ func initContextWithBasicAuth(ctx *Context) bool {
}
}
-// special case for panel render calls with api key
-func initContextWithApiKeyFromSession(ctx *Context) bool {
- keyId := ctx.Session.Get(SESS_KEY_APIKEY)
- if keyId == nil {
- return false
- }
-
- keyQuery := m.GetApiKeyByIdQuery{ApiKeyId: keyId.(int64)}
- if err := bus.Dispatch(&keyQuery); err != nil {
- log.Error(3, "Failed to get api key by id", err)
- return false
- } else {
- apikey := keyQuery.Result
-
- ctx.IsSignedIn = true
- ctx.SignedInUser = &m.SignedInUser{}
- ctx.OrgRole = apikey.Role
- ctx.ApiKeyId = apikey.Id
- ctx.OrgId = apikey.OrgId
- return true
- }
-}
-
// Handle handles and logs error by given status.
func (ctx *Context) Handle(status int, title string, err error) {
if err != nil {
- log.Error(4, "%s: %v", title, err)
+ ctx.Logger.Error(title, "error", err)
if setting.Env != setting.PROD {
ctx.Data["ErrorMsg"] = err
}
}
- switch status {
- case 200:
- metrics.M_Page_Status_200.Inc(1)
- case 404:
- metrics.M_Page_Status_404.Inc(1)
- case 500:
- metrics.M_Page_Status_500.Inc(1)
- }
-
ctx.Data["Title"] = title
+ ctx.Data["AppSubUrl"] = setting.AppSubUrl
ctx.HTML(status, strconv.Itoa(status))
}
func (ctx *Context) JsonOK(message string) {
resp := make(map[string]interface{})
-
resp["message"] = message
-
ctx.JSON(200, resp)
}
@@ -232,7 +207,7 @@ func (ctx *Context) JsonApiErr(status int, message string, err error) {
resp := make(map[string]interface{})
if err != nil {
- log.Error(4, "%s: %v", message, err)
+ ctx.Logger.Error(message, "error", err)
if setting.Env != setting.PROD {
resp["error"] = err.Error()
}
@@ -240,10 +215,8 @@ func (ctx *Context) JsonApiErr(status int, message string, err error) {
switch status {
case 404:
- metrics.M_Api_Status_404.Inc(1)
resp["message"] = "Not Found"
case 500:
- metrics.M_Api_Status_500.Inc(1)
resp["message"] = "Internal Server Error"
}
@@ -257,3 +230,11 @@ func (ctx *Context) JsonApiErr(status int, message string, err error) {
func (ctx *Context) HasUserRole(role m.RoleType) bool {
return ctx.OrgRole.Includes(role)
}
+
+func (ctx *Context) HasHelpFlag(flag m.HelpFlags1) bool {
+ return ctx.HelpFlags1.HasFlag(flag)
+}
+
+func (ctx *Context) TimeRequest(timer metrics.Timer) {
+ ctx.Data["perfmon.timer"] = timer
+}
diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go
index cb37a809212..5cffa0a2884 100644
--- a/pkg/middleware/middleware_test.go
+++ b/pkg/middleware/middleware_test.go
@@ -9,6 +9,7 @@ import (
"github.com/go-macaron/session"
"github.com/grafana/grafana/pkg/bus"
+ l "github.com/grafana/grafana/pkg/login"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
@@ -58,6 +59,10 @@ func TestMiddlewareContext(t *testing.T) {
return nil
})
+ bus.AddHandler("test", func(loginUserQuery *l.LoginUserQuery) error {
+ return nil
+ })
+
bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error {
query.Result = &m.SignedInUser{OrgId: 2, UserId: 12}
return nil
@@ -191,9 +196,7 @@ func TestMiddlewareContext(t *testing.T) {
}
})
- var createUserCmd *m.CreateUserCommand
bus.AddHandler("test", func(cmd *m.CreateUserCommand) error {
- createUserCmd = cmd
cmd.Result = m.User{Id: 33}
return nil
})
@@ -210,6 +213,99 @@ func TestMiddlewareContext(t *testing.T) {
})
})
+ middlewareScenario("When auth_proxy is enabled and request RemoteAddr is not trusted", func(sc *scenarioContext) {
+ setting.AuthProxyEnabled = true
+ setting.AuthProxyHeaderName = "X-WEBAUTH-USER"
+ setting.AuthProxyHeaderProperty = "username"
+ setting.AuthProxyWhitelist = "192.168.1.1, 192.168.2.1"
+
+ sc.fakeReq("GET", "/")
+ sc.req.Header.Add("X-WEBAUTH-USER", "torkelo")
+ sc.req.RemoteAddr = "192.168.3.1:12345"
+ sc.exec()
+
+ Convey("should return 407 status code", func() {
+ So(sc.resp.Code, ShouldEqual, 407)
+ })
+ })
+
+ middlewareScenario("When auth_proxy is enabled and request RemoteAddr is trusted", func(sc *scenarioContext) {
+ setting.AuthProxyEnabled = true
+ setting.AuthProxyHeaderName = "X-WEBAUTH-USER"
+ setting.AuthProxyHeaderProperty = "username"
+ setting.AuthProxyWhitelist = "192.168.1.1, 192.168.2.1"
+
+ bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error {
+ query.Result = &m.SignedInUser{OrgId: 4, UserId: 33}
+ return nil
+ })
+
+ sc.fakeReq("GET", "/")
+ sc.req.Header.Add("X-WEBAUTH-USER", "torkelo")
+ sc.req.RemoteAddr = "192.168.2.1:12345"
+ sc.exec()
+
+ Convey("Should init context with user info", func() {
+ So(sc.context.IsSignedIn, ShouldBeTrue)
+ So(sc.context.UserId, ShouldEqual, 33)
+ So(sc.context.OrgId, ShouldEqual, 4)
+ })
+ })
+
+ middlewareScenario("When session exists for previous user, create a new session", func(sc *scenarioContext) {
+ setting.AuthProxyEnabled = true
+ setting.AuthProxyHeaderName = "X-WEBAUTH-USER"
+ setting.AuthProxyHeaderProperty = "username"
+ setting.AuthProxyWhitelist = ""
+
+ bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error {
+ query.Result = &m.SignedInUser{OrgId: 4, UserId: 32}
+ return nil
+ })
+
+ // create session
+ sc.fakeReq("GET", "/").handler(func(c *Context) {
+ c.Session.Set(SESS_KEY_USERID, int64(33))
+ }).exec()
+
+ oldSessionID := sc.context.Session.ID()
+
+ sc.req.Header.Add("X-WEBAUTH-USER", "torkelo")
+ sc.exec()
+
+ newSessionID := sc.context.Session.ID()
+
+ Convey("Should not share session with other user", func() {
+ So(oldSessionID, ShouldNotEqual, newSessionID)
+ })
+ })
+
+ middlewareScenario("When auth_proxy and ldap enabled call sync with ldap user", func(sc *scenarioContext) {
+ setting.AuthProxyEnabled = true
+ setting.AuthProxyHeaderName = "X-WEBAUTH-USER"
+ setting.AuthProxyHeaderProperty = "username"
+ setting.AuthProxyWhitelist = ""
+ setting.LdapEnabled = true
+
+ called := false
+ syncGrafanaUserWithLdapUser = func(ctx *Context, query *m.GetSignedInUserQuery) error {
+ called = true
+ return nil
+ }
+
+ bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error {
+ query.Result = &m.SignedInUser{OrgId: 4, UserId: 32}
+ return nil
+ })
+
+ sc.fakeReq("GET", "/")
+ sc.req.Header.Add("X-WEBAUTH-USER", "torkelo")
+ sc.exec()
+
+ Convey("Should call syncGrafanaUserWithLdapUser", func() {
+ So(called, ShouldBeTrue)
+ })
+ })
})
}
diff --git a/pkg/middleware/perf.go b/pkg/middleware/perf.go
new file mode 100644
index 00000000000..e381121a47f
--- /dev/null
+++ b/pkg/middleware/perf.go
@@ -0,0 +1,12 @@
+package middleware
+
+import (
+ "net/http"
+
+ "gopkg.in/macaron.v1"
+)
+
+func MeasureRequestTime() macaron.Handler {
+ return func(res http.ResponseWriter, req *http.Request, c *Context) {
+ }
+}
diff --git a/pkg/middleware/quota.go b/pkg/middleware/quota.go
index d9e68f7560a..23f98e78a7e 100644
--- a/pkg/middleware/quota.go
+++ b/pkg/middleware/quota.go
@@ -4,7 +4,6 @@ import (
"fmt"
"github.com/grafana/grafana/pkg/bus"
- "github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
"gopkg.in/macaron.v1"
@@ -35,10 +34,8 @@ func QuotaReached(c *Context, target string) (bool, error) {
return false, err
}
- log.Debug(fmt.Sprintf("checking quota for %s in scopes %v", target, scopes))
-
for _, scope := range scopes {
- log.Debug(fmt.Sprintf("checking scope %s", scope.Name))
+ c.Logger.Debug("Checking quota", "target", target, "scope", scope)
switch scope.Name {
case "global":
@@ -51,7 +48,7 @@ func QuotaReached(c *Context, target string) (bool, error) {
if target == "session" {
usedSessions := getSessionCount()
if int64(usedSessions) > scope.DefaultLimit {
- log.Debug(fmt.Sprintf("%d sessions active, limit is %d", usedSessions, scope.DefaultLimit))
+ c.Logger.Debug("Sessions limit reached", "active", usedSessions, "limit", scope.DefaultLimit)
return true, nil
}
continue
diff --git a/pkg/middleware/recovery.go b/pkg/middleware/recovery.go
new file mode 100644
index 00000000000..b63bc623549
--- /dev/null
+++ b/pkg/middleware/recovery.go
@@ -0,0 +1,148 @@
+// Copyright 2013 Martini Authors
+// Copyright 2014 The Macaron Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package middleware
+
+import (
+ "bytes"
+ "fmt"
+ "io/ioutil"
+ "runtime"
+
+ "gopkg.in/macaron.v1"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+var (
+ dunno = []byte("???")
+ centerDot = []byte("·")
+ dot = []byte(".")
+ slash = []byte("/")
+)
+
+// stack returns a nicely formated stack frame, skipping skip frames
+func stack(skip int) []byte {
+ buf := new(bytes.Buffer) // the returned data
+ // As we loop, we open files and read them. These variables record the currently
+ // loaded file.
+ var lines [][]byte
+ var lastFile string
+ for i := skip; ; i++ { // Skip the expected number of frames
+ pc, file, line, ok := runtime.Caller(i)
+ if !ok {
+ break
+ }
+ // Print this much at least. If we can't find the source, it won't show.
+ fmt.Fprintf(buf, "%s:%d (0x%x)\n", file, line, pc)
+ if file != lastFile {
+ data, err := ioutil.ReadFile(file)
+ if err != nil {
+ continue
+ }
+ lines = bytes.Split(data, []byte{'\n'})
+ lastFile = file
+ }
+ fmt.Fprintf(buf, "\t%s: %s\n", function(pc), source(lines, line))
+ }
+ return buf.Bytes()
+}
+
+// source returns a space-trimmed slice of the n'th line.
+func source(lines [][]byte, n int) []byte {
+ n-- // in stack trace, lines are 1-indexed but our array is 0-indexed
+ if n < 0 || n >= len(lines) {
+ return dunno
+ }
+ return bytes.TrimSpace(lines[n])
+}
+
+// function returns, if possible, the name of the function containing the PC.
+func function(pc uintptr) []byte {
+ fn := runtime.FuncForPC(pc)
+ if fn == nil {
+ return dunno
+ }
+ name := []byte(fn.Name())
+ // The name includes the path name to the package, which is unnecessary
+ // since the file name is already included. Plus, it has center dots.
+ // That is, we see
+ // runtime/debug.*T·ptrmethod
+ // and want
+ // *T.ptrmethod
+ // Also the package path might contains dot (e.g. code.google.com/...),
+ // so first eliminate the path prefix
+ if lastslash := bytes.LastIndex(name, slash); lastslash >= 0 {
+ name = name[lastslash+1:]
+ }
+ if period := bytes.Index(name, dot); period >= 0 {
+ name = name[period+1:]
+ }
+ name = bytes.Replace(name, centerDot, dot, -1)
+ return name
+}
+
+// Recovery returns a middleware that recovers from any panics and writes a 500 if there was one.
+// While Martini is in development mode, Recovery will also output the panic as HTML.
+func Recovery() macaron.Handler {
+ return func(c *macaron.Context) {
+ defer func() {
+ if err := recover(); err != nil {
+ stack := stack(3)
+
+ panicLogger := log.Root
+ // try to get request logger
+ if ctx, ok := c.Data["ctx"]; ok {
+ ctxTyped := ctx.(*Context)
+ panicLogger = ctxTyped.Logger
+ }
+
+ panicLogger.Error("Request error", "error", err, "stack", string(stack))
+
+ c.Data["Title"] = "Server Error"
+ c.Data["AppSubUrl"] = setting.AppSubUrl
+
+ if theErr, ok := err.(error); ok {
+ c.Data["Title"] = theErr.Error()
+ }
+
+ if setting.Env == setting.DEV {
+ c.Data["ErrorMsg"] = string(stack)
+ }
+
+ c.HTML(500, "500")
+
+ // // Lookup the current responsewriter
+ // val := c.GetVal(inject.InterfaceOf((*http.ResponseWriter)(nil)))
+ // res := val.Interface().(http.ResponseWriter)
+ //
+ // // respond with panic message while in development mode
+ // var body []byte
+ // if setting.Env == setting.DEV {
+ // res.Header().Set("Content-Type", "text/html")
+ // body = []byte(fmt.Sprintf(panicHtml, err, err, stack))
+ // }
+ //
+ // res.WriteHeader(http.StatusInternalServerError)
+ // if nil != body {
+ // res.Write(body)
+ // }
+ }
+ }()
+
+ c.Next()
+ }
+}
diff --git a/pkg/middleware/render_auth.go b/pkg/middleware/render_auth.go
new file mode 100644
index 00000000000..3a57660c9bf
--- /dev/null
+++ b/pkg/middleware/render_auth.go
@@ -0,0 +1,55 @@
+package middleware
+
+import (
+ "sync"
+
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/util"
+)
+
+var renderKeysLock sync.Mutex
+var renderKeys map[string]*m.SignedInUser = make(map[string]*m.SignedInUser)
+
+func initContextWithRenderAuth(ctx *Context) bool {
+ key := ctx.GetCookie("renderKey")
+ if key == "" {
+ return false
+ }
+
+ renderKeysLock.Lock()
+ defer renderKeysLock.Unlock()
+
+ if renderUser, exists := renderKeys[key]; !exists {
+ ctx.JsonApiErr(401, "Invalid Render Key", nil)
+ return true
+ } else {
+
+ ctx.IsSignedIn = true
+ ctx.SignedInUser = renderUser
+ ctx.IsRenderCall = true
+ return true
+ }
+}
+
+type renderContextFunc func(key string) (string, error)
+
+func AddRenderAuthKey(orgId int64) string {
+ renderKeysLock.Lock()
+
+ key := util.GetRandomString(32)
+
+ renderKeys[key] = &m.SignedInUser{
+ OrgId: orgId,
+ OrgRole: m.ROLE_VIEWER,
+ }
+
+ renderKeysLock.Unlock()
+
+ return key
+}
+
+func RemoveRenderAuthKey(key string) {
+ renderKeysLock.Lock()
+ delete(renderKeys, key)
+ renderKeysLock.Unlock()
+}
diff --git a/pkg/middleware/request_metrics.go b/pkg/middleware/request_metrics.go
new file mode 100644
index 00000000000..417a1817d15
--- /dev/null
+++ b/pkg/middleware/request_metrics.go
@@ -0,0 +1,65 @@
+package middleware
+
+import (
+ "net/http"
+ "strings"
+
+ "github.com/grafana/grafana/pkg/metrics"
+ "gopkg.in/macaron.v1"
+)
+
+func RequestMetrics() macaron.Handler {
+ return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) {
+ rw := res.(macaron.ResponseWriter)
+ c.Next()
+
+ status := rw.Status()
+
+ if strings.HasPrefix(req.RequestURI, "/api/datasources/proxy") {
+ countProxyRequests(status)
+ } else if strings.HasPrefix(req.RequestURI, "/api/") {
+ countApiRequests(status)
+ } else {
+ countPageRequests(status)
+ }
+ }
+}
+
+func countApiRequests(status int) {
+ switch status {
+ case 200:
+ metrics.M_Api_Status_200.Inc(1)
+ case 404:
+ metrics.M_Api_Status_404.Inc(1)
+ case 500:
+ metrics.M_Api_Status_500.Inc(1)
+ default:
+ metrics.M_Api_Status_Unknown.Inc(1)
+ }
+}
+
+func countPageRequests(status int) {
+ switch status {
+ case 200:
+ metrics.M_Page_Status_200.Inc(1)
+ case 404:
+ metrics.M_Page_Status_404.Inc(1)
+ case 500:
+ metrics.M_Page_Status_500.Inc(1)
+ default:
+ metrics.M_Page_Status_Unknown.Inc(1)
+ }
+}
+
+func countProxyRequests(status int) {
+ switch status {
+ case 200:
+ metrics.M_Proxy_Status_200.Inc(1)
+ case 404:
+ metrics.M_Proxy_Status_404.Inc(1)
+ case 500:
+ metrics.M_Proxy_Status_500.Inc(1)
+ default:
+ metrics.M_Proxy_Status_Unknown.Inc(1)
+ }
+}
diff --git a/pkg/middleware/session.go b/pkg/middleware/session.go
index 583c57b85a5..0700612ecc2 100644
--- a/pkg/middleware/session.go
+++ b/pkg/middleware/session.go
@@ -12,8 +12,10 @@ import (
)
const (
- SESS_KEY_USERID = "uid"
- SESS_KEY_APIKEY = "apikey_id" // used fror render requests with api keys
+ SESS_KEY_USERID = "uid"
+ SESS_KEY_OAUTH_STATE = "state"
+ SESS_KEY_APIKEY = "apikey_id" // used for render requests with api keys
+ SESS_KEY_LASTLDAPSYNC = "last_ldap_sync"
)
var sessionManager *session.Manager
diff --git a/pkg/middleware/util.go b/pkg/middleware/util.go
index babda94d5e7..c392f215450 100644
--- a/pkg/middleware/util.go
+++ b/pkg/middleware/util.go
@@ -17,6 +17,10 @@ func Gziper() macaron.Handler {
return
}
+ if strings.HasPrefix(requestPath, "/api/plugin-proxy/") {
+ return
+ }
+
ctx.Invoke(macaronGziper)
}
}
diff --git a/pkg/middleware/validate_host.go b/pkg/middleware/validate_host.go
index 606606b56e4..fa84e783767 100644
--- a/pkg/middleware/validate_host.go
+++ b/pkg/middleware/validate_host.go
@@ -8,7 +8,12 @@ import (
)
func ValidateHostHeader(domain string) macaron.Handler {
- return func(c *macaron.Context) {
+ return func(c *Context) {
+ // ignore local render calls
+ if c.IsRenderCall {
+ return
+ }
+
h := c.Req.Host
if i := strings.Index(h, ":"); i >= 0 {
h = h[:i]
diff --git a/pkg/models/alert.go b/pkg/models/alert.go
new file mode 100644
index 00000000000..61976677764
--- /dev/null
+++ b/pkg/models/alert.go
@@ -0,0 +1,199 @@
+package models
+
+import (
+ "time"
+
+ "fmt"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+)
+
+type AlertStateType string
+type AlertSeverityType string
+type NoDataOption string
+type ExecutionErrorOption string
+
+const (
+ AlertStateNoData AlertStateType = "no_data"
+ AlertStatePaused AlertStateType = "paused"
+ AlertStateAlerting AlertStateType = "alerting"
+ AlertStateOK AlertStateType = "ok"
+ AlertStatePending AlertStateType = "pending"
+)
+
+const (
+ NoDataSetOK NoDataOption = "ok"
+ NoDataSetNoData NoDataOption = "no_data"
+ NoDataKeepState NoDataOption = "keep_state"
+ NoDataSetAlerting NoDataOption = "alerting"
+)
+
+const (
+ ExecutionErrorSetAlerting ExecutionErrorOption = "alerting"
+ ExecutionErrorKeepState ExecutionErrorOption = "keep_state"
+)
+
+var (
+ ErrCannotChangeStateOnPausedAlert error = fmt.Errorf("Cannot change state on pause alert")
+)
+
+func (s AlertStateType) IsValid() bool {
+ return s == AlertStateOK || s == AlertStateNoData || s == AlertStatePaused || s == AlertStatePending
+}
+
+func (s NoDataOption) IsValid() bool {
+ return s == NoDataSetNoData || s == NoDataSetAlerting || s == NoDataKeepState || s == NoDataSetOK
+}
+
+func (s NoDataOption) ToAlertState() AlertStateType {
+ return AlertStateType(s)
+}
+
+func (s ExecutionErrorOption) IsValid() bool {
+ return s == ExecutionErrorSetAlerting || s == ExecutionErrorKeepState
+}
+
+func (s ExecutionErrorOption) ToAlertState() AlertStateType {
+ return AlertStateType(s)
+}
+
+type Alert struct {
+ Id int64
+ Version int64
+ OrgId int64
+ DashboardId int64
+ PanelId int64
+ Name string
+ Message string
+ Severity string
+ State AlertStateType
+ Handler int64
+ Silenced bool
+ ExecutionError string
+ Frequency int64
+
+ EvalData *simplejson.Json
+ NewStateDate time.Time
+ StateChanges int
+
+ Created time.Time
+ Updated time.Time
+
+ Settings *simplejson.Json
+}
+
+func (alert *Alert) ValidToSave() bool {
+ return alert.DashboardId != 0 && alert.OrgId != 0 && alert.PanelId != 0
+}
+
+func (alert *Alert) ShouldUpdateState(newState AlertStateType) bool {
+ return alert.State != newState
+}
+
+func (this *Alert) ContainsUpdates(other *Alert) bool {
+ result := false
+ result = result || this.Name != other.Name
+ result = result || this.Message != other.Message
+
+ if this.Settings != nil && other.Settings != nil {
+ json1, err1 := this.Settings.Encode()
+ json2, err2 := other.Settings.Encode()
+
+ if err1 != nil || err2 != nil {
+ return false
+ }
+
+ result = result || string(json1) != string(json2)
+ }
+
+ //don't compare .State! That would be insane.
+ return result
+}
+
+type AlertingClusterInfo struct {
+ ServerId string
+ ClusterSize int
+ UptimePosition int
+}
+
+type HeartBeat struct {
+ Id int64
+ ServerId string
+ Updated time.Time
+ Created time.Time
+}
+
+type HeartBeatCommand struct {
+ ServerId string
+ Result AlertingClusterInfo
+}
+
+type SaveAlertsCommand struct {
+ DashboardId int64
+ UserId int64
+ OrgId int64
+
+ Alerts []*Alert
+}
+
+type PauseAlertCommand struct {
+ OrgId int64
+ AlertIds []int64
+ ResultCount int64
+ Paused bool
+}
+
+type PauseAllAlertCommand struct {
+ ResultCount int64
+ Paused bool
+}
+
+type SetAlertStateCommand struct {
+ AlertId int64
+ OrgId int64
+ State AlertStateType
+ Error string
+ EvalData *simplejson.Json
+
+ Timestamp time.Time
+}
+
+type DeleteAlertCommand struct {
+ AlertId int64
+}
+
+//Queries
+type GetAlertsQuery struct {
+ OrgId int64
+ State []string
+ DashboardId int64
+ PanelId int64
+ Limit int64
+
+ Result []*Alert
+}
+
+type GetAllAlertsQuery struct {
+ Result []*Alert
+}
+
+type GetAlertByIdQuery struct {
+ Id int64
+
+ Result *Alert
+}
+
+type GetAlertStatesForDashboardQuery struct {
+ OrgId int64
+ DashboardId int64
+
+ Result []*AlertStateInfoDTO
+}
+
+type AlertStateInfoDTO struct {
+ Id int64 `json:"id"`
+ DashboardId int64 `json:"dashboardId"`
+ PanelId int64 `json:"panelId"`
+ State AlertStateType `json:"state"`
+ NewStateDate time.Time `json:"newStateDate"`
+}
diff --git a/pkg/models/alert_notifications.go b/pkg/models/alert_notifications.go
new file mode 100644
index 00000000000..87b515f370c
--- /dev/null
+++ b/pkg/models/alert_notifications.go
@@ -0,0 +1,65 @@
+package models
+
+import (
+ "time"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+)
+
+type AlertNotification struct {
+ Id int64 `json:"id"`
+ OrgId int64 `json:"-"`
+ Name string `json:"name"`
+ Type string `json:"type"`
+ IsDefault bool `json:"isDefault"`
+ Settings *simplejson.Json `json:"settings"`
+ Created time.Time `json:"created"`
+ Updated time.Time `json:"updated"`
+}
+
+type CreateAlertNotificationCommand struct {
+ Name string `json:"name" binding:"Required"`
+ Type string `json:"type" binding:"Required"`
+ IsDefault bool `json:"isDefault"`
+ Settings *simplejson.Json `json:"settings"`
+
+ OrgId int64 `json:"-"`
+ Result *AlertNotification
+}
+
+type UpdateAlertNotificationCommand struct {
+ Id int64 `json:"id" binding:"Required"`
+ Name string `json:"name" binding:"Required"`
+ Type string `json:"type" binding:"Required"`
+ IsDefault bool `json:"isDefault"`
+ Settings *simplejson.Json `json:"settings" binding:"Required"`
+
+ OrgId int64 `json:"-"`
+ Result *AlertNotification
+}
+
+type DeleteAlertNotificationCommand struct {
+ Id int64
+ OrgId int64
+}
+
+type GetAlertNotificationsQuery struct {
+ Name string
+ Id int64
+ OrgId int64
+
+ Result *AlertNotification
+}
+
+type GetAlertNotificationsToSendQuery struct {
+ Ids []int64
+ OrgId int64
+
+ Result []*AlertNotification
+}
+
+type GetAllAlertNotificationsQuery struct {
+ OrgId int64
+
+ Result []*AlertNotification
+}
diff --git a/pkg/models/alert_test.go b/pkg/models/alert_test.go
new file mode 100644
index 00000000000..421b90f1b21
--- /dev/null
+++ b/pkg/models/alert_test.go
@@ -0,0 +1,39 @@
+package models
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestAlertingModelTest(t *testing.T) {
+ Convey("Testing Alerting model", t, func() {
+
+ json1, _ := simplejson.NewJson([]byte(`{ "field": "value" }`))
+ json2, _ := simplejson.NewJson([]byte(`{ "field": "value" }`))
+
+ rule1 := &Alert{
+ Settings: json1,
+ Name: "Namn",
+ Message: "Message",
+ }
+
+ rule2 := &Alert{
+ Settings: json2,
+ Name: "Namn",
+ Message: "Message",
+ }
+
+ Convey("Testing AlertRule equals", func() {
+
+ So(rule1.ContainsUpdates(rule2), ShouldBeFalse)
+ })
+
+ Convey("Changing the expression should contain update", func() {
+ json2, _ := simplejson.NewJson([]byte(`{ "field": "newValue" }`))
+ rule1.Settings = json2
+ So(rule1.ContainsUpdates(rule2), ShouldBeTrue)
+ })
+ })
+}
diff --git a/pkg/models/dashboard_snapshot.go b/pkg/models/dashboard_snapshot.go
index f920e91f2e4..57c5524ace8 100644
--- a/pkg/models/dashboard_snapshot.go
+++ b/pkg/models/dashboard_snapshot.go
@@ -45,7 +45,7 @@ type DashboardSnapshotDTO struct {
type CreateDashboardSnapshotCommand struct {
Dashboard *simplejson.Json `json:"dashboard" binding:"Required"`
- Name string `json:"name" binding:"Required"`
+ Name string `json:"name"`
Expires int64 `json:"expires"`
// these are passed when storing an external snapshot ref
@@ -63,6 +63,9 @@ type DeleteDashboardSnapshotCommand struct {
DeleteKey string `json:"-"`
}
+type DeleteExpiredSnapshotsCommand struct {
+}
+
type GetDashboardSnapshotQuery struct {
Key string
diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go
index 6243c729624..634b26c3f29 100644
--- a/pkg/models/dashboards.go
+++ b/pkg/models/dashboards.go
@@ -15,8 +15,17 @@ var (
ErrDashboardSnapshotNotFound = errors.New("Dashboard snapshot not found")
ErrDashboardWithSameNameExists = errors.New("A dashboard with the same name already exists")
ErrDashboardVersionMismatch = errors.New("The dashboard has been changed by someone else")
+ ErrDashboardTitleEmpty = errors.New("Dashboard title cannot be empty")
)
+type UpdatePluginDashboardError struct {
+ PluginId string
+}
+
+func (d UpdatePluginDashboardError) Error() string {
+ return "Dashboard belong to plugin"
+}
+
var (
DashTypeJson = "file"
DashTypeDB = "db"
@@ -26,10 +35,12 @@ var (
// Dashboard model
type Dashboard struct {
- Id int64
- Slug string
- OrgId int64
- Version int
+ Id int64
+ Slug string
+ OrgId int64
+ GnetId int64
+ Version int
+ PluginId string
Created time.Time
Updated time.Time
@@ -77,6 +88,10 @@ func NewDashboardFromJson(data *simplejson.Json) *Dashboard {
dash.Updated = time.Now()
}
+ if gnetId, err := dash.Data.Get("gnetId").Float64(); err == nil {
+ dash.GnetId = int64(gnetId)
+ }
+
return dash
}
@@ -90,6 +105,7 @@ func (cmd *SaveDashboardCommand) GetDashboardModel() *Dashboard {
dash.UpdatedBy = cmd.UserId
dash.OrgId = cmd.OrgId
+ dash.PluginId = cmd.PluginId
dash.UpdateSlug()
return dash
}
@@ -114,6 +130,7 @@ type SaveDashboardCommand struct {
UserId int64 `json:"userId"`
OrgId int64 `json:"-"`
Overwrite bool `json:"overwrite"`
+ PluginId string `json:"-"`
Result *Dashboard
}
@@ -146,5 +163,16 @@ type GetDashboardTagsQuery struct {
type GetDashboardsQuery struct {
DashboardIds []int64
- Result *[]Dashboard
+ Result []*Dashboard
+}
+
+type GetDashboardsByPluginIdQuery struct {
+ OrgId int64
+ PluginId string
+ Result []*Dashboard
+}
+
+type GetDashboardSlugByIdQuery struct {
+ Id int64
+ Result string
}
diff --git a/pkg/models/datasource.go b/pkg/models/datasource.go
index 2e9d98e9700..4a90edd9bfd 100644
--- a/pkg/models/datasource.go
+++ b/pkg/models/datasource.go
@@ -4,6 +4,7 @@ import (
"errors"
"time"
+ "github.com/grafana/grafana/pkg/components/securejsondata"
"github.com/grafana/grafana/pkg/components/simplejson"
)
@@ -22,7 +23,8 @@ const (
// Typed errors
var (
- ErrDataSourceNotFound = errors.New("Data source not found")
+ ErrDataSourceNotFound = errors.New("Data source not found")
+ ErrDataSourceNameExists = errors.New("Data source with same name already exists")
)
type DsAccess string
@@ -45,6 +47,7 @@ type DataSource struct {
WithCredentials bool
IsDefault bool
JsonData *simplejson.Json
+ SecureJsonData securejsondata.SecureJsonData
Created time.Time
Updated time.Time
@@ -76,19 +79,20 @@ func IsKnownDataSourcePlugin(dsType string) bool {
// Also acts as api DTO
type AddDataSourceCommand struct {
- Name string `json:"name" binding:"Required"`
- Type string `json:"type" binding:"Required"`
- Access DsAccess `json:"access" binding:"Required"`
- Url string `json:"url"`
- Password string `json:"password"`
- Database string `json:"database"`
- User string `json:"user"`
- BasicAuth bool `json:"basicAuth"`
- BasicAuthUser string `json:"basicAuthUser"`
- BasicAuthPassword string `json:"basicAuthPassword"`
- WithCredentials bool `json:"withCredentials"`
- IsDefault bool `json:"isDefault"`
- JsonData *simplejson.Json `json:"jsonData"`
+ Name string `json:"name" binding:"Required"`
+ Type string `json:"type" binding:"Required"`
+ Access DsAccess `json:"access" binding:"Required"`
+ Url string `json:"url"`
+ Password string `json:"password"`
+ Database string `json:"database"`
+ User string `json:"user"`
+ BasicAuth bool `json:"basicAuth"`
+ BasicAuthUser string `json:"basicAuthUser"`
+ BasicAuthPassword string `json:"basicAuthPassword"`
+ WithCredentials bool `json:"withCredentials"`
+ IsDefault bool `json:"isDefault"`
+ JsonData *simplejson.Json `json:"jsonData"`
+ SecureJsonData map[string]string `json:"secureJsonData"`
OrgId int64 `json:"-"`
@@ -97,19 +101,20 @@ type AddDataSourceCommand struct {
// Also acts as api DTO
type UpdateDataSourceCommand struct {
- Name string `json:"name" binding:"Required"`
- Type string `json:"type" binding:"Required"`
- Access DsAccess `json:"access" binding:"Required"`
- Url string `json:"url"`
- Password string `json:"password"`
- User string `json:"user"`
- Database string `json:"database"`
- BasicAuth bool `json:"basicAuth"`
- BasicAuthUser string `json:"basicAuthUser"`
- BasicAuthPassword string `json:"basicAuthPassword"`
- WithCredentials bool `json:"withCredentials"`
- IsDefault bool `json:"isDefault"`
- JsonData *simplejson.Json `json:"jsonData"`
+ Name string `json:"name" binding:"Required"`
+ Type string `json:"type" binding:"Required"`
+ Access DsAccess `json:"access" binding:"Required"`
+ Url string `json:"url"`
+ Password string `json:"password"`
+ User string `json:"user"`
+ Database string `json:"database"`
+ BasicAuth bool `json:"basicAuth"`
+ BasicAuthUser string `json:"basicAuthUser"`
+ BasicAuthPassword string `json:"basicAuthPassword"`
+ WithCredentials bool `json:"withCredentials"`
+ IsDefault bool `json:"isDefault"`
+ JsonData *simplejson.Json `json:"jsonData"`
+ SecureJsonData map[string]string `json:"secureJsonData"`
OrgId int64 `json:"-"`
Id int64 `json:"-"`
@@ -131,13 +136,13 @@ type GetDataSourcesQuery struct {
type GetDataSourceByIdQuery struct {
Id int64
OrgId int64
- Result DataSource
+ Result *DataSource
}
type GetDataSourceByNameQuery struct {
Name string
OrgId int64
- Result DataSource
+ Result *DataSource
}
// ---------------------
diff --git a/pkg/models/datasource_cache.go b/pkg/models/datasource_cache.go
new file mode 100644
index 00000000000..e32c0ac9e7c
--- /dev/null
+++ b/pkg/models/datasource_cache.go
@@ -0,0 +1,95 @@
+package models
+
+import (
+ "crypto/tls"
+ "crypto/x509"
+ "net"
+ "net/http"
+ "sync"
+ "time"
+)
+
+type proxyTransportCache struct {
+ cache map[int64]cachedTransport
+ sync.Mutex
+}
+
+type cachedTransport struct {
+ updated time.Time
+
+ *http.Transport
+}
+
+var ptc = proxyTransportCache{
+ cache: make(map[int64]cachedTransport),
+}
+
+func (ds *DataSource) GetHttpClient() (*http.Client, error) {
+ transport, err := ds.GetHttpTransport()
+
+ if err != nil {
+ return nil, err
+ }
+
+ return &http.Client{
+ Timeout: time.Duration(30 * time.Second),
+ Transport: transport,
+ }, nil
+}
+
+func (ds *DataSource) GetHttpTransport() (*http.Transport, error) {
+ ptc.Lock()
+ defer ptc.Unlock()
+
+ if t, present := ptc.cache[ds.Id]; present && ds.Updated.Equal(t.updated) {
+ return t.Transport, nil
+ }
+
+ transport := &http.Transport{
+ TLSClientConfig: &tls.Config{
+ InsecureSkipVerify: true,
+ },
+ Proxy: http.ProxyFromEnvironment,
+ Dial: (&net.Dialer{
+ Timeout: 30 * time.Second,
+ KeepAlive: 30 * time.Second,
+ }).Dial,
+ TLSHandshakeTimeout: 10 * time.Second,
+ ExpectContinueTimeout: 1 * time.Second,
+ MaxIdleConns: 100,
+ IdleConnTimeout: 90 * time.Second,
+ }
+
+ var tlsAuth, tlsAuthWithCACert bool
+ if ds.JsonData != nil {
+ tlsAuth = ds.JsonData.Get("tlsAuth").MustBool(false)
+ tlsAuthWithCACert = ds.JsonData.Get("tlsAuthWithCACert").MustBool(false)
+ }
+
+ if tlsAuth {
+ transport.TLSClientConfig.InsecureSkipVerify = false
+
+ decrypted := ds.SecureJsonData.Decrypt()
+
+ if tlsAuthWithCACert && len(decrypted["tlsCACert"]) > 0 {
+ caPool := x509.NewCertPool()
+ ok := caPool.AppendCertsFromPEM([]byte(decrypted["tlsCACert"]))
+ if ok {
+ transport.TLSClientConfig.RootCAs = caPool
+ }
+ }
+
+ cert, err := tls.X509KeyPair([]byte(decrypted["tlsClientCert"]), []byte(decrypted["tlsClientKey"]))
+ if err != nil {
+ return nil, err
+ }
+ transport.TLSClientConfig.Certificates = []tls.Certificate{cert}
+ }
+
+ ptc.cache[ds.Id] = cachedTransport{
+ Transport: transport,
+ updated: ds.Updated,
+ }
+
+ return transport, nil
+}
diff --git a/pkg/models/datasource_cache_test.go b/pkg/models/datasource_cache_test.go
new file mode 100644
index 00000000000..25fee55529d
--- /dev/null
+++ b/pkg/models/datasource_cache_test.go
@@ -0,0 +1,157 @@
+package models
+
+import (
+ "testing"
+ "time"
+
+ . "github.com/smartystreets/goconvey/convey"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/setting"
+ "github.com/grafana/grafana/pkg/util"
+)
+
+func TestDataSourceCache(t *testing.T) {
+ Convey("When caching a datasource proxy", t, func() {
+ clearCache()
+ ds := DataSource{
+ Id: 1,
+ Url: "http://k8s:8001",
+ Type: "Kubernetes",
+ }
+
+ t1, err := ds.GetHttpTransport()
+ So(err, ShouldBeNil)
+
+ t2, err := ds.GetHttpTransport()
+ So(err, ShouldBeNil)
+
+ Convey("Should be using the cached proxy", func() {
+ So(t2, ShouldEqual, t1)
+ })
+ })
+
+ Convey("When getting kubernetes datasource proxy", t, func() {
+ clearCache()
+ setting.SecretKey = "password"
+
+ json := simplejson.New()
+ json.Set("tlsAuth", true)
+ json.Set("tlsAuthWithCACert", true)
+
+ t := time.Now()
+ ds := DataSource{
+ Url: "http://k8s:8001",
+ Type: "Kubernetes",
+ Updated: t.Add(-2 * time.Minute),
+ }
+
+ transport, err := ds.GetHttpTransport()
+ So(err, ShouldBeNil)
+
+ Convey("Should have no cert", func() {
+ So(transport.TLSClientConfig.InsecureSkipVerify, ShouldEqual, true)
+ })
+
+ ds.JsonData = json
+ ds.SecureJsonData = map[string][]byte{
+ "tlsCACert": util.Encrypt([]byte(caCert), "password"),
+ "tlsClientCert": util.Encrypt([]byte(clientCert), "password"),
+ "tlsClientKey": util.Encrypt([]byte(clientKey), "password"),
+ }
+ ds.Updated = t.Add(-1 * time.Minute)
+
+ transport, err = ds.GetHttpTransport()
+ So(err, ShouldBeNil)
+
+ Convey("Should add cert", func() {
+ So(transport.TLSClientConfig.InsecureSkipVerify, ShouldEqual, false)
+ So(len(transport.TLSClientConfig.Certificates), ShouldEqual, 1)
+ })
+
+ ds.JsonData = nil
+ ds.SecureJsonData = map[string][]byte{}
+ ds.Updated = t
+
+ transport, err = ds.GetHttpTransport()
+ So(err, ShouldBeNil)
+
+ Convey("Should remove cert", func() {
+ So(transport.TLSClientConfig.InsecureSkipVerify, ShouldEqual, true)
+ So(len(transport.TLSClientConfig.Certificates), ShouldEqual, 0)
+ })
+ })
+}
+
+func clearCache() {
+ ptc.Lock()
+ defer ptc.Unlock()
+
+ ptc.cache = make(map[int64]cachedTransport)
+}
+
+const caCert string = `-----BEGIN CERTIFICATE-----
+MIIDATCCAemgAwIBAgIJAMQ5hC3CPDTeMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
+BAMMDGNhLWs4cy1zdGhsbTAeFw0xNjEwMjcwODQyMjdaFw00NDAzMTQwODQyMjda
+MBcxFTATBgNVBAMMDGNhLWs4cy1zdGhsbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMLe2AmJ6IleeUt69vgNchOjjmxIIxz5sp1vFu94m1vUip7CqnOg
+QkpUsHeBPrGYv8UGloARCL1xEWS+9FVZeXWQoDmbC0SxXhFwRIESNCET7Q8KMi/4
+4YPvnMLGZi3Fjwxa8BdUBCN1cx4WEooMVTWXm7RFMtZgDfuOAn3TNXla732sfT/d
+1HNFrh48b0wA+HhmA3nXoBnBEblA665hCeo7lIAdRr0zJxJpnFnWXkyTClsAUTMN
+iL905LdBiiIRenojipfKXvMz88XSaWTI7JjZYU3BvhyXndkT6f12cef3I96NY3WJ
+0uIK4k04WrbzdYXMU3rN6NqlvbHqnI+E7aMCAwEAAaNQME4wHQYDVR0OBBYEFHHx
+2+vSPw9bECHj3O51KNo5VdWOMB8GA1UdIwQYMBaAFHHx2+vSPw9bECHj3O51KNo5
+VdWOMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAH2eV5NcV3LBJHs9
+I+adbiTPg2vyumrGWwy73T0X8Dtchgt8wU7Q9b9Ucg2fOTmSSyS0iMqEu1Yb2ORB
+CknM9mixHC9PwEBbkGCom3VVkqdLwSP6gdILZgyLoH4i8sTUz+S1yGPepi+Vzhs7
+adOXtryjcGnwft6HdfKPNklMOHFnjw6uqpho54oj/z55jUpicY/8glDHdrr1bh3k
+MHuiWLGewHXPvxfG6UoUx1te65IhifVcJGFZDQwfEmhBflfCmtAJlZEsgTLlBBCh
+FHoXIyGOdq1chmRVocdGBCF8fUoGIbuF14r53rpvcbEKtKnnP8+96luKAZLq0a4n
+3lb92xM=
+-----END CERTIFICATE-----`
+
+const clientCert string = `-----BEGIN CERTIFICATE-----
+MIICsjCCAZoCCQCcd8sOfstQLzANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxj
+YS1rOHMtc3RobG0wHhcNMTYxMTAyMDkyNTE1WhcNMTcxMTAyMDkyNTE1WjAfMR0w
+GwYDVQQDDBRhZG0tZGFuaWVsLWs4cy1zdGhsbTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOMliaWyNEUJKM37vWCl5bGub3lMicyRAqGQyY/qxD9yKKM2
+FbucVcmWmg5vvTqQVl5rlQ+c7GI8OD6ptmFl8a26coEki7bFr8bkpSyBSEc5p27b
+Z0ORFSqBHWHQbr9PkxPLYW6T3gZYUtRYv3OQgGxLXlvUh85n/mQfuR3N1FgmShHo
+GtAFi/ht6leXa0Ms+jNSDLCmXpJm1GIEqgyKX7K3+g3vzo9coYqXq4XTa8Efs2v8
+SCwqWfBC3rHfgs/5DLB8WT4Kul8QzxkytzcaBQfRfzhSV6bkgm7oTzt2/1eRRsf4
+YnXzLE9YkCC9sAn+Owzqf+TYC1KRluWDfqqBTJUCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAdMsZg6edWGC+xngizn0uamrUg1ViaDqUsz0vpzY5NWLA4MsBc4EtxWRP
+ueQvjUimZ3U3+AX0YWNLIrH1FCVos2jdij/xkTUmHcwzr8rQy+B17cFi+a8jtpgw
+AU6WWoaAIEhhbWQfth/Diz3mivl1ARB+YqiWca2mjRPLTPcKJEURDVddQ423el0Q
+4JNxS5icu7T2zYTYHAo/cT9zVdLZl0xuLxYm3asK1IONJ/evxyVZima3il6MPvhe
+58Hwz+m+HdqHxi24b/1J/VKYbISG4huOQCdLzeNXgvwFlGPUmHSnnKo1/KbQDAR5
+llG/Sw5+FquFuChaA6l5KWy7F3bQyA==
+-----END CERTIFICATE-----`
+
+const clientKey string = `-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA4yWJpbI0RQkozfu9YKXlsa5veUyJzJECoZDJj+rEP3IoozYV
+u5xVyZaaDm+9OpBWXmuVD5zsYjw4Pqm2YWXxrbpygSSLtsWvxuSlLIFIRzmnbttn
+Q5EVKoEdYdBuv0+TE8thbpPeBlhS1Fi/c5CAbEteW9SHzmf+ZB+5Hc3UWCZKEega
+0AWL+G3qV5drQyz6M1IMsKZekmbUYgSqDIpfsrf6De/Oj1yhiperhdNrwR+za/xI
+LCpZ8ELesd+Cz/kMsHxZPgq6XxDPGTK3NxoFB9F/OFJXpuSCbuhPO3b/V5FGx/hi
+dfMsT1iQIL2wCf47DOp/5NgLUpGW5YN+qoFMlQIDAQABAoIBAQCzy4u312XeW1Cs
+Mx6EuOwmh59/ESFmBkZh4rxZKYgrfE5EWlQ7i5SwG4BX+wR6rbNfy6JSmHDXlTkk
+CKvvToVNcW6fYHEivDnVojhIERFIJ4+rhQmpBtcNLOQ3/4cZ8X/GxE6b+3lb5l+x
+64mnjPLKRaIr5/+TVuebEy0xNTJmjnJ7yiB2HRz7uXEQaVSk/P7KAkkyl/9J3/LM
+8N9AX1w6qDaNQZ4/P0++1H4SQenosM/b/GqGTomarEk/GE0NcB9rzmR9VCXa7FRh
+WV5jyt9vUrwIEiK/6nUnOkGO8Ei3kB7Y+e+2m6WdaNoU5RAfqXmXa0Q/a0lLRruf
+vTMo2WrBAoGBAPRaK4cx76Q+3SJ/wfznaPsMM06OSR8A3ctKdV+ip/lyKtb1W8Pz
+k8MYQDH7GwPtSu5QD8doL00pPjugZL/ba7X9nAsI+pinyEErfnB9y7ORNEjIYYzs
+DiqDKup7ANgw1gZvznWvb9Ge0WUSXvWS0pFkgootQAf+RmnnbWGH6l6RAoGBAO35
+aGUrLro5u9RD24uSXNU3NmojINIQFK5dHAT3yl0BBYstL43AEsye9lX95uMPTvOQ
+Cqcn42Hjp/bSe3n0ObyOZeXVrWcDFAfE0wwB1BkvL1lpgnFO9+VQORlH4w3Ppnpo
+jcPkR2TFeDaAYtvckhxe/Bk3OnuFmnsQ3VzM75fFAoGBAI6PvS2XeNU+yA3EtA01
+hg5SQ+zlHswz2TMuMeSmJZJnhY78f5mHlwIQOAPxGQXlf/4iP9J7en1uPpzTK3S0
+M9duK4hUqMA/w5oiIhbHjf0qDnMYVbG+V1V+SZ+cPBXmCDihKreGr5qBKnHpkfV8
+v9WL6o1rcRw4wiQvnaV1gsvBAoGBALtzVTczr6gDKCAIn5wuWy+cQSGTsBunjRLX
+xuVm5iEiV+KMYkPvAx/pKzMLP96lRVR3ptyKgAKwl7LFk3u50+zh4gQLr35QH2wL
+Lw7rNc3srAhrItPsFzqrWX6/cGuFoKYVS239l/sZzRppQPXcpb7xVvTp2whHcir0
+Wtnpl+TdAoGAGqKqo2KU3JoY3IuTDUk1dsNAm8jd9EWDh+s1x4aG4N79mwcss5GD
+FF8MbFPneK7xQd8L6HisKUDAUi2NOyynM81LAftPkvN6ZuUVeFDfCL4vCA0HUXLD
++VrOhtUZkNNJlLMiVRJuQKUOGlg8PpObqYbstQAf/0/yFJMRHG82Tcg=
+-----END RSA PRIVATE KEY-----`
diff --git a/pkg/models/emails.go b/pkg/models/emails.go
deleted file mode 100644
index 74da180f7d8..00000000000
--- a/pkg/models/emails.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package models
-
-import "errors"
-
-var ErrInvalidEmailCode = errors.New("Invalid or expired email code")
-
-type SendEmailCommand struct {
- To []string
- Template string
- Data map[string]interface{}
- Massive bool
- Info string
-}
-
-type SendResetPasswordEmailCommand struct {
- User *User
-}
-
-type ValidateResetPasswordCodeQuery struct {
- Code string
- Result *User
-}
diff --git a/pkg/models/helpflags.go b/pkg/models/helpflags.go
new file mode 100644
index 00000000000..1bab730e265
--- /dev/null
+++ b/pkg/models/helpflags.go
@@ -0,0 +1,18 @@
+package models
+
+type HelpFlags1 uint64
+
+const (
+ HelpFlagGettingStartedPanelDismissed HelpFlags1 = 1 << iota
+ HelpFlagDashboardHelp1
+)
+
+func (f HelpFlags1) HasFlag(flag HelpFlags1) bool { return f&flag != 0 }
+func (f *HelpFlags1) AddFlag(flag HelpFlags1) { *f |= flag }
+func (f *HelpFlags1) ClearFlag(flag HelpFlags1) { *f &= ^flag }
+func (f *HelpFlags1) ToggleFlag(flag HelpFlags1) { *f ^= flag }
+
+type SetUserHelpFlagCommand struct {
+ HelpFlags1 HelpFlags1
+ UserId int64
+}
diff --git a/pkg/models/models.go b/pkg/models/models.go
index 189e594576b..3f4b27ed6ab 100644
--- a/pkg/models/models.go
+++ b/pkg/models/models.go
@@ -6,4 +6,6 @@ const (
GITHUB OAuthType = iota + 1
GOOGLE
TWITTER
+ GENERIC
+ GRAFANANET
)
diff --git a/pkg/models/notifications.go b/pkg/models/notifications.go
new file mode 100644
index 00000000000..42ebda9ea44
--- /dev/null
+++ b/pkg/models/notifications.go
@@ -0,0 +1,35 @@
+package models
+
+import "errors"
+
+var ErrInvalidEmailCode = errors.New("Invalid or expired email code")
+
+type SendEmailCommand struct {
+ To []string
+ Template string
+ Subject string
+ Data map[string]interface{}
+ Info string
+ EmbededFiles []string
+}
+
+type SendEmailCommandSync struct {
+ SendEmailCommand
+}
+
+type SendWebhookSync struct {
+ Url string
+ User string
+ Password string
+ Body string
+ HttpMethod string
+}
+
+type SendResetPasswordEmailCommand struct {
+ User *User
+}
+
+type ValidateResetPasswordCodeQuery struct {
+ Code string
+ Result *User
+}
diff --git a/pkg/models/org_user.go b/pkg/models/org_user.go
index 48d17deb9db..d7a918751ef 100644
--- a/pkg/models/org_user.go
+++ b/pkg/models/org_user.go
@@ -1,7 +1,9 @@
package models
import (
+ "encoding/json"
"errors"
+ "fmt"
"time"
)
@@ -37,6 +39,26 @@ func (r RoleType) Includes(other RoleType) bool {
return r == other
}
+func (r *RoleType) UnmarshalJSON(data []byte) error {
+ var str string
+ err := json.Unmarshal(data, &str)
+ if err != nil {
+ return err
+ }
+
+ *r = RoleType(str)
+
+ if (*r).IsValid() == false {
+ if (*r) != "" {
+ return errors.New(fmt.Sprintf("JSON validation error: invalid role value: %s", *r))
+ }
+
+ *r = ROLE_VIEWER
+ }
+
+ return nil
+}
+
type OrgUser struct {
Id int64
OrgId int64
diff --git a/pkg/models/playlist.go b/pkg/models/playlist.go
index 4c6eacbb6a6..5c49bb9256c 100644
--- a/pkg/models/playlist.go
+++ b/pkg/models/playlist.go
@@ -57,17 +57,6 @@ func (this PlaylistDashboard) TableName() string {
type Playlists []*Playlist
type PlaylistDashboards []*PlaylistDashboard
-//
-// DTOS
-//
-
-type PlaylistDashboardDto struct {
- Id int64 `json:"id"`
- Slug string `json:"slug"`
- Title string `json:"title"`
- Uri string `json:"uri"`
-}
-
//
// COMMANDS
//
diff --git a/pkg/models/plugin_settings.go b/pkg/models/plugin_settings.go
index d030c125ba9..bbfbaabd8c6 100644
--- a/pkg/models/plugin_settings.go
+++ b/pkg/models/plugin_settings.go
@@ -4,8 +4,7 @@ import (
"errors"
"time"
- "github.com/grafana/grafana/pkg/setting"
- "github.com/grafana/grafana/pkg/util"
+ "github.com/grafana/grafana/pkg/components/securejsondata"
)
var (
@@ -19,22 +18,13 @@ type PluginSetting struct {
Enabled bool
Pinned bool
JsonData map[string]interface{}
- SecureJsonData SecureJsonData
+ SecureJsonData securejsondata.SecureJsonData
+ PluginVersion string
Created time.Time
Updated time.Time
}
-type SecureJsonData map[string][]byte
-
-func (s SecureJsonData) Decrypt() map[string]string {
- decrypted := make(map[string]string)
- for key, data := range s {
- decrypted[key] = string(util.Decrypt(data, setting.SecretKey))
- }
- return decrypted
-}
-
// ----------------------
// COMMANDS
@@ -44,17 +34,21 @@ type UpdatePluginSettingCmd struct {
Pinned bool `json:"pinned"`
JsonData map[string]interface{} `json:"jsonData"`
SecureJsonData map[string]string `json:"secureJsonData"`
+ PluginVersion string `json:"version"`
PluginId string `json:"-"`
OrgId int64 `json:"-"`
}
-func (cmd *UpdatePluginSettingCmd) GetEncryptedJsonData() SecureJsonData {
- encrypted := make(SecureJsonData)
- for key, data := range cmd.SecureJsonData {
- encrypted[key] = util.Encrypt([]byte(data), setting.SecretKey)
- }
- return encrypted
+// specific command, will only update version
+type UpdatePluginSettingVersionCmd struct {
+ PluginVersion string
+ PluginId string `json:"-"`
+ OrgId int64 `json:"-"`
+}
+
+func (cmd *UpdatePluginSettingCmd) GetEncryptedJsonData() securejsondata.SecureJsonData {
+ return securejsondata.GetEncryptedJsonData(cmd.SecureJsonData)
}
// ---------------------
@@ -65,10 +59,11 @@ type GetPluginSettingsQuery struct {
}
type PluginSettingInfoDTO struct {
- OrgId int64
- PluginId string
- Enabled bool
- Pinned bool
+ OrgId int64
+ PluginId string
+ Enabled bool
+ Pinned bool
+ PluginVersion string
}
type GetPluginSettingByIdQuery struct {
@@ -76,3 +71,9 @@ type GetPluginSettingByIdQuery struct {
OrgId int64
Result *PluginSetting
}
+
+type PluginStateChangedEvent struct {
+ PluginId string
+ OrgId int64
+ Enabled bool
+}
diff --git a/pkg/models/preferences.go b/pkg/models/preferences.go
new file mode 100644
index 00000000000..4c77bc96d4d
--- /dev/null
+++ b/pkg/models/preferences.go
@@ -0,0 +1,53 @@
+package models
+
+import (
+ "errors"
+ "time"
+)
+
+// Typed errors
+var (
+ ErrPreferencesNotFound = errors.New("Preferences not found")
+)
+
+type Preferences struct {
+ Id int64
+ OrgId int64
+ UserId int64
+ Version int
+ HomeDashboardId int64
+ Timezone string
+ Theme string
+ Created time.Time
+ Updated time.Time
+}
+
+// ---------------------
+// QUERIES
+
+type GetPreferencesQuery struct {
+ Id int64
+ OrgId int64
+ UserId int64
+
+ Result *Preferences
+}
+
+type GetPreferencesWithDefaultsQuery struct {
+ Id int64
+ OrgId int64
+ UserId int64
+
+ Result *Preferences
+}
+
+// ---------------------
+// COMMANDS
+type SavePreferencesCommand struct {
+ UserId int64
+ OrgId int64
+
+ HomeDashboardId int64 `json:"homeDashboardId"`
+ Timezone string `json:"timezone"`
+ Theme string `json:"theme"`
+}
diff --git a/pkg/models/server.go b/pkg/models/server.go
new file mode 100644
index 00000000000..876fc91dd01
--- /dev/null
+++ b/pkg/models/server.go
@@ -0,0 +1,10 @@
+package models
+
+import "context"
+
+type GrafanaServer interface {
+ context.Context
+
+ Start()
+ Shutdown(code int, reason string)
+}
diff --git a/pkg/models/stats.go b/pkg/models/stats.go
index 63f946b956b..09c251b6cd7 100644
--- a/pkg/models/stats.go
+++ b/pkg/models/stats.go
@@ -1,10 +1,11 @@
package models
type SystemStats struct {
- DashboardCount int
- UserCount int
- OrgCount int
- PlaylistCount int
+ DashboardCount int64
+ UserCount int64
+ OrgCount int64
+ PlaylistCount int64
+ AlertCount int64
}
type DataSourceStats struct {
@@ -21,15 +22,15 @@ type GetDataSourceStatsQuery struct {
}
type AdminStats struct {
- UserCount int `json:"user_count"`
- OrgCount int `json:"org_count"`
- DashboardCount int `json:"dashboard_count"`
- DbSnapshotCount int `json:"db_snapshot_count"`
- DbTagCount int `json:"db_tag_count"`
- DataSourceCount int `json:"data_source_count"`
- PlaylistCount int `json:"playlist_count"`
- StarredDbCount int `json:"starred_db_count"`
- GrafanaAdminCount int `json:"grafana_admin_count"`
+ UserCount int `json:"user_count"`
+ OrgCount int `json:"org_count"`
+ DashboardCount int `json:"dashboard_count"`
+ DbSnapshotCount int `json:"db_snapshot_count"`
+ DbTagCount int `json:"db_tag_count"`
+ DataSourceCount int `json:"data_source_count"`
+ PlaylistCount int `json:"playlist_count"`
+ StarredDbCount int `json:"starred_db_count"`
+ AlertCount int `json:"alert_count"`
}
type GetAdminStatsQuery struct {
diff --git a/pkg/models/user.go b/pkg/models/user.go
index 2842bad490d..e14f4486ba3 100644
--- a/pkg/models/user.go
+++ b/pkg/models/user.go
@@ -10,6 +10,12 @@ var (
ErrUserNotFound = errors.New("User not found")
)
+type Password string
+
+func (p Password) IsWeak() bool {
+ return len(p) <= 4
+}
+
type User struct {
Id int64
Version int
@@ -22,6 +28,7 @@ type User struct {
Company string
EmailVerified bool
Theme string
+ HelpFlags1 HelpFlags1
IsAdmin bool
OrgId int64
@@ -44,15 +51,16 @@ func (u *User) NameOrFallback() string {
// COMMANDS
type CreateUserCommand struct {
- Email string
- Login string
- Name string
- Company string
- OrgName string
- Password string
- EmailVerified bool
- IsAdmin bool
- SkipOrgSetup bool
+ Email string
+ Login string
+ Name string
+ Company string
+ OrgName string
+ Password string
+ EmailVerified bool
+ IsAdmin bool
+ SkipOrgSetup bool
+ DefaultOrgRole string
Result User
}
@@ -95,6 +103,11 @@ type GetUserByLoginQuery struct {
Result *User
}
+type GetUserByEmailQuery struct {
+ Email string
+ Result *User
+}
+
type GetUserByIdQuery struct {
Id int64
Result *User
@@ -136,9 +149,9 @@ type SignedInUser struct {
Login string
Name string
Email string
- Theme string
ApiKeyId int64
IsGrafanaAdmin bool
+ HelpFlags1 HelpFlags1
}
type UserProfileDTO struct {
diff --git a/pkg/plugins/app_plugin.go b/pkg/plugins/app_plugin.go
index f565b0e2b22..cc588bf1d55 100644
--- a/pkg/plugins/app_plugin.go
+++ b/pkg/plugins/app_plugin.go
@@ -76,8 +76,6 @@ func (app *AppPlugin) initApp() {
}
}
- app.DefaultNavUrl = setting.AppSubUrl + "/plugins/" + app.Id + "/edit"
-
// slugify pages
for _, include := range app.Includes {
if include.Slug == "" {
diff --git a/pkg/plugins/dashboard_importer.go b/pkg/plugins/dashboard_importer.go
index 834bfabd048..1b3e4bac182 100644
--- a/pkg/plugins/dashboard_importer.go
+++ b/pkg/plugins/dashboard_importer.go
@@ -11,12 +11,14 @@ import (
)
type ImportDashboardCommand struct {
- Path string `json:"string"`
- Inputs []ImportDashboardInput `json:"inputs"`
+ Dashboard *simplejson.Json
+ Path string
+ Inputs []ImportDashboardInput
+ Overwrite bool
- OrgId int64 `json:"-"`
- UserId int64 `json:"-"`
- PluginId string `json:"-"`
+ OrgId int64
+ UserId int64
+ PluginId string
Result *PluginDashboardInfoDTO
}
@@ -40,17 +42,15 @@ func init() {
}
func ImportDashboard(cmd *ImportDashboardCommand) error {
- plugin, exists := Plugins[cmd.PluginId]
-
- if !exists {
- return PluginNotFoundError{cmd.PluginId}
- }
-
var dashboard *m.Dashboard
var err error
- if dashboard, err = loadPluginDashboard(plugin, cmd.Path); err != nil {
- return err
+ if cmd.PluginId != "" {
+ if dashboard, err = loadPluginDashboard(cmd.PluginId, cmd.Path); err != nil {
+ return err
+ }
+ } else {
+ dashboard = m.NewDashboardFromJson(cmd.Dashboard)
}
evaluator := &DashTemplateEvaluator{
@@ -67,6 +67,8 @@ func ImportDashboard(cmd *ImportDashboardCommand) error {
Dashboard: generatedDash,
OrgId: cmd.OrgId,
UserId: cmd.UserId,
+ Overwrite: cmd.Overwrite,
+ PluginId: cmd.PluginId,
}
if err := bus.Dispatch(&saveCmd); err != nil {
@@ -74,13 +76,13 @@ func ImportDashboard(cmd *ImportDashboardCommand) error {
}
cmd.Result = &PluginDashboardInfoDTO{
- PluginId: cmd.PluginId,
- Title: dashboard.Title,
- Path: cmd.Path,
- Revision: dashboard.GetString("revision", "1.0"),
- InstalledUri: "db/" + saveCmd.Result.Slug,
- InstalledRevision: dashboard.GetString("revision", "1.0"),
- Installed: true,
+ PluginId: cmd.PluginId,
+ Title: dashboard.Title,
+ Path: cmd.Path,
+ Revision: dashboard.Data.Get("revision").MustInt64(1),
+ ImportedUri: "db/" + saveCmd.Result.Slug,
+ ImportedRevision: dashboard.Data.Get("revision").MustInt64(1),
+ Imported: true,
}
return nil
@@ -108,7 +110,7 @@ func (this *DashTemplateEvaluator) findInput(varName string, varType string) *Im
func (this *DashTemplateEvaluator) Eval() (*simplejson.Json, error) {
this.result = simplejson.New()
this.variables = make(map[string]string)
- this.varRegex, _ = regexp.Compile(`(\$\{\w+\})`)
+ this.varRegex, _ = regexp.Compile(`(\$\{.+\})`)
// check that we have all inputs we need
for _, inputDef := range this.template.Get("__inputs").MustArray() {
diff --git a/pkg/plugins/dashboards.go b/pkg/plugins/dashboards.go
index 932196a42a9..5d26766b8e5 100644
--- a/pkg/plugins/dashboards.go
+++ b/pkg/plugins/dashboards.go
@@ -10,14 +10,16 @@ import (
)
type PluginDashboardInfoDTO struct {
- PluginId string `json:"pluginId"`
- Title string `json:"title"`
- Installed bool `json:"installed"`
- InstalledUri string `json:"installedUri"`
- InstalledRevision string `json:"installedRevision"`
- Revision string `json:"revision"`
- Description string `json:"description"`
- Path string `json:"path"`
+ PluginId string `json:"pluginId"`
+ Title string `json:"title"`
+ Imported bool `json:"imported"`
+ ImportedUri string `json:"importedUri"`
+ Slug string `json:"slug"`
+ ImportedRevision int64 `json:"importedRevision"`
+ Revision int64 `json:"revision"`
+ Description string `json:"description"`
+ Path string `json:"path"`
+ Removed bool `json:"removed"`
}
func GetPluginDashboards(orgId int64, pluginId string) ([]*PluginDashboardInfoDTO, error) {
@@ -29,20 +31,64 @@ func GetPluginDashboards(orgId int64, pluginId string) ([]*PluginDashboardInfoDT
result := make([]*PluginDashboardInfoDTO, 0)
+ // load current dashboards
+ query := m.GetDashboardsByPluginIdQuery{OrgId: orgId, PluginId: pluginId}
+ if err := bus.Dispatch(&query); err != nil {
+ return nil, err
+ }
+
+ existingMatches := make(map[int64]bool)
+
for _, include := range plugin.Includes {
- if include.Type == PluginTypeDashboard {
- if dashInfo, err := getDashboardImportStatus(orgId, plugin, include.Path); err != nil {
- return nil, err
- } else {
- result = append(result, dashInfo)
+ if include.Type != PluginTypeDashboard {
+ continue
+ }
+
+ res := &PluginDashboardInfoDTO{}
+ var dashboard *m.Dashboard
+ var err error
+
+ if dashboard, err = loadPluginDashboard(plugin.Id, include.Path); err != nil {
+ return nil, err
+ }
+
+ res.Path = include.Path
+ res.PluginId = plugin.Id
+ res.Title = dashboard.Title
+ res.Revision = dashboard.Data.Get("revision").MustInt64(1)
+
+ // find existing dashboard
+ for _, existingDash := range query.Result {
+ if existingDash.Slug == dashboard.Slug {
+ res.Imported = true
+ res.ImportedUri = "db/" + existingDash.Slug
+ res.ImportedRevision = existingDash.Data.Get("revision").MustInt64(1)
+ existingMatches[existingDash.Id] = true
}
}
+
+ result = append(result, res)
+ }
+
+ // find deleted dashboards
+ for _, dash := range query.Result {
+ if _, exists := existingMatches[dash.Id]; !exists {
+ result = append(result, &PluginDashboardInfoDTO{
+ Slug: dash.Slug,
+ Removed: true,
+ })
+ }
}
return result, nil
}
-func loadPluginDashboard(plugin *PluginBase, path string) (*m.Dashboard, error) {
+func loadPluginDashboard(pluginId, path string) (*m.Dashboard, error) {
+ plugin, exists := Plugins[pluginId]
+
+ if !exists {
+ return nil, PluginNotFoundError{pluginId}
+ }
dashboardFilePath := filepath.Join(plugin.PluginDir, path)
reader, err := os.Open(dashboardFilePath)
@@ -59,33 +105,3 @@ func loadPluginDashboard(plugin *PluginBase, path string) (*m.Dashboard, error)
return m.NewDashboardFromJson(data), nil
}
-
-func getDashboardImportStatus(orgId int64, plugin *PluginBase, path string) (*PluginDashboardInfoDTO, error) {
- res := &PluginDashboardInfoDTO{}
-
- var dashboard *m.Dashboard
- var err error
-
- if dashboard, err = loadPluginDashboard(plugin, path); err != nil {
- return nil, err
- }
-
- res.Path = path
- res.PluginId = plugin.Id
- res.Title = dashboard.Title
- res.Revision = dashboard.GetString("revision", "1.0")
-
- query := m.GetDashboardQuery{OrgId: orgId, Slug: dashboard.Slug}
-
- if err := bus.Dispatch(&query); err != nil {
- if err != m.ErrDashboardNotFound {
- return nil, err
- }
- } else {
- res.Installed = true
- res.InstalledUri = "db/" + query.Result.Slug
- res.InstalledRevision = query.Result.GetString("revision", "1.0")
- }
-
- return res, nil
-}
diff --git a/pkg/plugins/dashboards_test.go b/pkg/plugins/dashboards_test.go
index bdd08ceefd2..980d7bb91bd 100644
--- a/pkg/plugins/dashboards_test.go
+++ b/pkg/plugins/dashboards_test.go
@@ -4,6 +4,7 @@ import (
"testing"
"github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/simplejson"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
. "github.com/smartystreets/goconvey/convey"
@@ -31,6 +32,17 @@ func TestPluginDashboards(t *testing.T) {
return m.ErrDashboardNotFound
})
+ bus.AddHandler("test", func(query *m.GetDashboardsByPluginIdQuery) error {
+ var data = simplejson.New()
+ data.Set("title", "Nginx Connections")
+ data.Set("revision", 22)
+
+ query.Result = []*m.Dashboard{
+ {Slug: "nginx-connections", Data: data},
+ }
+ return nil
+ })
+
dashboards, err := GetPluginDashboards(1, "test-app")
So(err, ShouldBeNil)
@@ -41,12 +53,12 @@ func TestPluginDashboards(t *testing.T) {
Convey("should include installed version info", func() {
So(dashboards[0].Title, ShouldEqual, "Nginx Connections")
- So(dashboards[0].Revision, ShouldEqual, "1.5")
- So(dashboards[0].InstalledRevision, ShouldEqual, "1.1")
- So(dashboards[0].InstalledUri, ShouldEqual, "db/nginx-connections")
+ So(dashboards[0].Revision, ShouldEqual, 25)
+ So(dashboards[0].ImportedRevision, ShouldEqual, 22)
+ So(dashboards[0].ImportedUri, ShouldEqual, "db/nginx-connections")
- So(dashboards[1].Revision, ShouldEqual, "2.0")
- So(dashboards[1].InstalledRevision, ShouldEqual, "")
+ So(dashboards[1].Revision, ShouldEqual, 2)
+ So(dashboards[1].ImportedRevision, ShouldEqual, 0)
})
})
diff --git a/pkg/plugins/dashboards_updater.go b/pkg/plugins/dashboards_updater.go
new file mode 100644
index 00000000000..52a623e73dd
--- /dev/null
+++ b/pkg/plugins/dashboards_updater.go
@@ -0,0 +1,139 @@
+package plugins
+
+import (
+ "time"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+)
+
+func init() {
+ bus.AddEventListener(handlePluginStateChanged)
+}
+
+func updateAppDashboards() {
+ time.Sleep(time.Second * 5)
+
+ plog.Debug("Looking for App Dashboard Updates")
+
+ query := m.GetPluginSettingsQuery{OrgId: 0}
+
+ if err := bus.Dispatch(&query); err != nil {
+ plog.Error("Failed to get all plugin settings", "error", err)
+ return
+ }
+
+ for _, pluginSetting := range query.Result {
+ // ignore disabled plugins
+ if !pluginSetting.Enabled {
+ continue
+ }
+
+ if pluginDef, exist := Plugins[pluginSetting.PluginId]; exist {
+ if pluginDef.Info.Version != pluginSetting.PluginVersion {
+ syncPluginDashboards(pluginDef, pluginSetting.OrgId)
+ }
+ }
+ }
+}
+
+func autoUpdateAppDashboard(pluginDashInfo *PluginDashboardInfoDTO, orgId int64) error {
+ if dash, err := loadPluginDashboard(pluginDashInfo.PluginId, pluginDashInfo.Path); err != nil {
+ return err
+ } else {
+ plog.Info("Auto updating App dashboard", "dashboard", dash.Title, "newRev", pluginDashInfo.Revision, "oldRev", pluginDashInfo.ImportedRevision)
+ updateCmd := ImportDashboardCommand{
+ OrgId: orgId,
+ PluginId: pluginDashInfo.PluginId,
+ Overwrite: true,
+ Dashboard: dash.Data,
+ UserId: 0,
+ Path: pluginDashInfo.Path,
+ }
+
+ if err := bus.Dispatch(&updateCmd); err != nil {
+ return err
+ }
+ }
+ return nil
+}
+
+func syncPluginDashboards(pluginDef *PluginBase, orgId int64) {
+ plog.Info("Syncing plugin dashboards to DB", "pluginId", pluginDef.Id)
+
+ // Get plugin dashboards
+ dashboards, err := GetPluginDashboards(orgId, pluginDef.Id)
+
+ if err != nil {
+ plog.Error("Failed to load app dashboards", "error", err)
+ return
+ }
+
+ // Update dashboards with updated revisions
+ for _, dash := range dashboards {
+ // remove removed ones
+ if dash.Removed {
+ plog.Info("Deleting plugin dashboard", "pluginId", pluginDef.Id, "dashboard", dash.Slug)
+
+ deleteCmd := m.DeleteDashboardCommand{OrgId: orgId, Slug: dash.Slug}
+ if err := bus.Dispatch(&deleteCmd); err != nil {
+ plog.Error("Failed to auto update app dashboard", "pluginId", pluginDef.Id, "error", err)
+ return
+ }
+
+ continue
+ }
+
+ // update updated ones
+ if dash.ImportedRevision != dash.Revision {
+ if err := autoUpdateAppDashboard(dash, orgId); err != nil {
+ plog.Error("Failed to auto update app dashboard", "pluginId", pluginDef.Id, "error", err)
+ return
+ }
+ }
+ }
+
+ // update version in plugin_setting table to mark that we have processed the update
+ query := m.GetPluginSettingByIdQuery{PluginId: pluginDef.Id, OrgId: orgId}
+ if err := bus.Dispatch(&query); err != nil {
+ plog.Error("Failed to read plugin setting by id", "error", err)
+ return
+ }
+
+ appSetting := query.Result
+ cmd := m.UpdatePluginSettingVersionCmd{
+ OrgId: appSetting.OrgId,
+ PluginId: appSetting.PluginId,
+ PluginVersion: pluginDef.Info.Version,
+ }
+
+ if err := bus.Dispatch(&cmd); err != nil {
+ plog.Error("Failed to update plugin setting version", "error", err)
+ }
+}
+
+func handlePluginStateChanged(event *m.PluginStateChangedEvent) error {
+ plog.Info("Plugin state changed", "pluginId", event.PluginId, "enabled", event.Enabled)
+
+ if event.Enabled {
+ syncPluginDashboards(Plugins[event.PluginId], event.OrgId)
+ } else {
+ query := m.GetDashboardsByPluginIdQuery{PluginId: event.PluginId, OrgId: event.OrgId}
+
+ if err := bus.Dispatch(&query); err != nil {
+ return err
+ } else {
+ for _, dash := range query.Result {
+ deleteCmd := m.DeleteDashboardCommand{OrgId: dash.OrgId, Slug: dash.Slug}
+
+ plog.Info("Deleting plugin dashboard", "pluginId", event.PluginId, "dashboard", dash.Slug)
+
+ if err := bus.Dispatch(&deleteCmd); err != nil {
+ return err
+ }
+ }
+ }
+ }
+
+ return nil
+}
diff --git a/pkg/plugins/datasource_plugin.go b/pkg/plugins/datasource_plugin.go
index b8c79f22998..aa092c2bc20 100644
--- a/pkg/plugins/datasource_plugin.go
+++ b/pkg/plugins/datasource_plugin.go
@@ -6,6 +6,7 @@ type DataSourcePlugin struct {
FrontendPluginBase
Annotations bool `json:"annotations"`
Metrics bool `json:"metrics"`
+ Alerting bool `json:"alerting"`
BuiltIn bool `json:"builtIn"`
Mixed bool `json:"mixed"`
App string `json:"app"`
diff --git a/pkg/plugins/frontend_plugin.go b/pkg/plugins/frontend_plugin.go
index 55690777b2a..8db480f947d 100644
--- a/pkg/plugins/frontend_plugin.go
+++ b/pkg/plugins/frontend_plugin.go
@@ -14,7 +14,7 @@ type FrontendPluginBase struct {
}
func (fp *FrontendPluginBase) initFrontendPlugin() {
- if isInternalPlugin(fp.PluginDir) {
+ if isExternalPlugin(fp.PluginDir) {
StaticRoutes = append(StaticRoutes, &PluginStaticRoute{
Directory: fp.PluginDir,
PluginId: fp.Id,
@@ -43,22 +43,28 @@ func (fp *FrontendPluginBase) setPathsBasedOnApp(app *AppPlugin) {
appSubPath := strings.Replace(fp.PluginDir, app.PluginDir, "", 1)
fp.IncludedInAppId = app.Id
fp.BaseUrl = app.BaseUrl
- fp.Module = util.JoinUrlFragments("plugins/"+app.Id, appSubPath) + "/module"
+
+ if isExternalPlugin(app.PluginDir) {
+ fp.Module = util.JoinUrlFragments("plugins/"+app.Id, appSubPath) + "/module"
+ } else {
+ fp.Module = util.JoinUrlFragments("app/plugins/app/"+app.Id, appSubPath) + "/module"
+ }
}
func (fp *FrontendPluginBase) handleModuleDefaults() {
- if isInternalPlugin(fp.PluginDir) {
+ if isExternalPlugin(fp.PluginDir) {
fp.Module = path.Join("plugins", fp.Id, "module")
fp.BaseUrl = path.Join("public/plugins", fp.Id)
return
}
+ fp.IsCorePlugin = true
fp.Module = path.Join("app/plugins", fp.Type, fp.Id, "module")
fp.BaseUrl = path.Join("public/app/plugins", fp.Type, fp.Id)
}
-func isInternalPlugin(pluginDir string) bool {
+func isExternalPlugin(pluginDir string) bool {
return !strings.Contains(pluginDir, setting.StaticRootPath)
}
diff --git a/pkg/plugins/models.go b/pkg/plugins/models.go
index 30f794285e1..7de12b4036c 100644
--- a/pkg/plugins/models.go
+++ b/pkg/plugins/models.go
@@ -6,8 +6,7 @@ import (
"fmt"
"strings"
- "github.com/grafana/grafana/pkg/log"
- "github.com/grafana/grafana/pkg/models"
+ m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
)
@@ -39,10 +38,15 @@ type PluginBase struct {
Includes []*PluginInclude `json:"includes"`
Module string `json:"module"`
BaseUrl string `json:"baseUrl"`
+ HideFromList bool `json:"hideFromList"`
IncludedInAppId string `json:"-"`
PluginDir string `json:"-"`
DefaultNavUrl string `json:"-"`
+ IsCorePlugin bool `json:"-"`
+
+ GrafanaNetVersion string `json:"-"`
+ GrafanaNetHasUpdate bool `json:"-"`
// cache for readme file contents
Readme []byte `json:"-"`
@@ -54,7 +58,7 @@ func (pb *PluginBase) registerPlugin(pluginDir string) error {
}
if !strings.HasPrefix(pluginDir, setting.StaticRootPath) {
- log.Info("Plugins: Registering plugin %v", pb.Name)
+ plog.Info("Registering plugin", "name", pb.Name)
}
if len(pb.Dependencies.Plugins) == 0 {
@@ -65,6 +69,12 @@ func (pb *PluginBase) registerPlugin(pluginDir string) error {
pb.Dependencies.GrafanaVersion = "*"
}
+ for _, include := range pb.Includes {
+ if include.Role == "" {
+ include.Role = m.RoleType(m.ROLE_VIEWER)
+ }
+ }
+
pb.PluginDir = pluginDir
Plugins[pb.Id] = pb
return nil
@@ -76,14 +86,14 @@ type PluginDependencies struct {
}
type PluginInclude struct {
- Name string `json:"name"`
- Path string `json:"path"`
- Type string `json:"type"`
- Component string `json:"component"`
- Role models.RoleType `json:"role"`
- AddToNav bool `json:"addToNav"`
- DefaultNav bool `json:"defaultNav"`
- Slug string `json:"slug"`
+ Name string `json:"name"`
+ Path string `json:"path"`
+ Type string `json:"type"`
+ Component string `json:"component"`
+ Role m.RoleType `json:"role"`
+ AddToNav bool `json:"addToNav"`
+ DefaultNav bool `json:"defaultNav"`
+ Slug string `json:"slug"`
Id string `json:"-"`
}
diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
index 0d69d5745b9..b6c3639cbbf 100644
--- a/pkg/plugins/plugins.go
+++ b/pkg/plugins/plugins.go
@@ -22,6 +22,10 @@ var (
Apps map[string]*AppPlugin
Plugins map[string]*PluginBase
PluginTypes map[string]interface{}
+
+ GrafanaLatestVersion string
+ GrafanaHasUpdate bool
+ plog log.Logger
)
type PluginScanner struct {
@@ -30,6 +34,8 @@ type PluginScanner struct {
}
func Init() error {
+ plog = log.New("plugins")
+
DataSources = make(map[string]*DataSourcePlugin)
StaticRoutes = make([]*PluginStaticRoute, 0)
Panels = make(map[string]*PanelPlugin)
@@ -41,16 +47,16 @@ func Init() error {
"app": AppPlugin{},
}
- log.Info("Plugins: Scan starting")
+ plog.Info("Starting plugin search")
scan(path.Join(setting.StaticRootPath, "app/plugins"))
// check if plugins dir exists
if _, err := os.Stat(setting.PluginsPath); os.IsNotExist(err) {
- log.Warn("Plugins: Plugin dir %v does not exist", setting.PluginsPath)
+ plog.Warn("Plugin dir does not exist", "dir", setting.PluginsPath)
if err = os.MkdirAll(setting.PluginsPath, os.ModePerm); err != nil {
- log.Warn("Plugins: Failed to create plugin dir: %v, error: %v", setting.PluginsPath, err)
+ plog.Warn("Failed to create plugin dir", "dir", setting.PluginsPath, "error", err)
} else {
- log.Info("Plugins: Plugin dir %v created", setting.PluginsPath)
+ plog.Info("Plugin dir created", "dir", setting.PluginsPath)
scan(setting.PluginsPath)
}
} else {
@@ -70,6 +76,9 @@ func Init() error {
app.initApp()
}
+ go StartPluginUpdateChecker()
+ go updateAppDashboards()
+
return nil
}
diff --git a/pkg/plugins/queries.go b/pkg/plugins/queries.go
index b930c9575a3..5ae1825a88f 100644
--- a/pkg/plugins/queries.go
+++ b/pkg/plugins/queries.go
@@ -24,7 +24,16 @@ func GetPluginSettings(orgId int64) (map[string]*m.PluginSettingInfoDTO, error)
}
// default to enabled true
- opt := &m.PluginSettingInfoDTO{Enabled: true}
+ opt := &m.PluginSettingInfoDTO{
+ PluginId: pluginDef.Id,
+ OrgId: orgId,
+ Enabled: true,
+ }
+
+ // apps are disabled by default
+ if pluginDef.Type == PluginTypeApp {
+ opt.Enabled = false
+ }
// if it's included in app check app settings
if pluginDef.IncludedInAppId != "" {
diff --git a/pkg/plugins/update_checker.go b/pkg/plugins/update_checker.go
new file mode 100644
index 00000000000..76c566803ac
--- /dev/null
+++ b/pkg/plugins/update_checker.go
@@ -0,0 +1,136 @@
+package plugins
+
+import (
+ "encoding/json"
+ "io/ioutil"
+ "net/http"
+ "strings"
+ "time"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/setting"
+ "github.com/hashicorp/go-version"
+)
+
+var (
+ httpClient http.Client = http.Client{Timeout: time.Duration(10 * time.Second)}
+)
+
+type GrafanaNetPlugin struct {
+ Slug string `json:"slug"`
+ Version string `json:"version"`
+}
+
+type GithubLatest struct {
+ Stable string `json:"stable"`
+ Testing string `json:"testing"`
+}
+
+func StartPluginUpdateChecker() {
+ if !setting.CheckForUpdates {
+ return
+ }
+
+ // do one check directly
+ go checkForUpdates()
+
+ ticker := time.NewTicker(time.Minute * 10)
+ for {
+ select {
+ case <-ticker.C:
+ checkForUpdates()
+ }
+ }
+}
+
+func getAllExternalPluginSlugs() string {
+ var result []string
+ for _, plug := range Plugins {
+ if plug.IsCorePlugin {
+ continue
+ }
+
+ result = append(result, plug.Id)
+ }
+
+ return strings.Join(result, ",")
+}
+
+func checkForUpdates() {
+ log.Trace("Checking for updates")
+
+ pluginSlugs := getAllExternalPluginSlugs()
+ resp, err := httpClient.Get("https://grafana.net/api/plugins/versioncheck?slugIn=" + pluginSlugs + "&grafanaVersion=" + setting.BuildVersion)
+
+ if err != nil {
+ log.Trace("Failed to get plugins repo from grafana.net, %v", err.Error())
+ return
+ }
+
+ defer resp.Body.Close()
+
+ body, err := ioutil.ReadAll(resp.Body)
+ if err != nil {
+ log.Trace("Update check failed, reading response from grafana.net, %v", err.Error())
+ return
+ }
+
+ gNetPlugins := []GrafanaNetPlugin{}
+ err = json.Unmarshal(body, &gNetPlugins)
+ if err != nil {
+ log.Trace("Failed to unmarshal plugin repo, reading response from grafana.net, %v", err.Error())
+ return
+ }
+
+ for _, plug := range Plugins {
+ for _, gplug := range gNetPlugins {
+ if gplug.Slug == plug.Id {
+ plug.GrafanaNetVersion = gplug.Version
+
+ plugVersion, err1 := version.NewVersion(plug.Info.Version)
+ gplugVersion, err2 := version.NewVersion(gplug.Version)
+
+ if err1 != nil || err2 != nil {
+ plug.GrafanaNetHasUpdate = plug.Info.Version != plug.GrafanaNetVersion
+ } else {
+ plug.GrafanaNetHasUpdate = plugVersion.LessThan(gplugVersion)
+ }
+ }
+ }
+ }
+
+ resp2, err := httpClient.Get("https://raw.githubusercontent.com/grafana/grafana/master/latest.json")
+ if err != nil {
+ log.Trace("Failed to get latest.json repo from github: %v", err.Error())
+ return
+ }
+
+ defer resp2.Body.Close()
+ body, err = ioutil.ReadAll(resp2.Body)
+ if err != nil {
+ log.Trace("Update check failed, reading response from github.com, %v", err.Error())
+ return
+ }
+
+ var githubLatest GithubLatest
+ err = json.Unmarshal(body, &githubLatest)
+ if err != nil {
+ log.Trace("Failed to unmarshal github latest, reading response from github: %v", err.Error())
+ return
+ }
+
+ if strings.Contains(setting.BuildVersion, "-") {
+ GrafanaLatestVersion = githubLatest.Testing
+ GrafanaHasUpdate = !strings.HasPrefix(setting.BuildVersion, githubLatest.Testing)
+ } else {
+ GrafanaLatestVersion = githubLatest.Stable
+ GrafanaHasUpdate = githubLatest.Stable != setting.BuildVersion
+ }
+
+ currVersion, err1 := version.NewVersion(setting.BuildVersion)
+ latestVersion, err2 := version.NewVersion(GrafanaLatestVersion)
+
+ if err1 == nil && err2 == nil {
+ GrafanaHasUpdate = currVersion.LessThan(latestVersion)
+ }
+}
diff --git a/pkg/services/alerting/commands.go b/pkg/services/alerting/commands.go
new file mode 100644
index 00000000000..62671a559fa
--- /dev/null
+++ b/pkg/services/alerting/commands.go
@@ -0,0 +1,55 @@
+package alerting
+
+import (
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+)
+
+type UpdateDashboardAlertsCommand struct {
+ UserId int64
+ OrgId int64
+ Dashboard *m.Dashboard
+}
+
+type ValidateDashboardAlertsCommand struct {
+ UserId int64
+ OrgId int64
+ Dashboard *m.Dashboard
+}
+
+func init() {
+ bus.AddHandler("alerting", updateDashboardAlerts)
+ bus.AddHandler("alerting", validateDashboardAlerts)
+}
+
+func validateDashboardAlerts(cmd *ValidateDashboardAlertsCommand) error {
+ extractor := NewDashAlertExtractor(cmd.Dashboard, cmd.OrgId)
+
+ if _, err := extractor.GetAlerts(); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func updateDashboardAlerts(cmd *UpdateDashboardAlertsCommand) error {
+ saveAlerts := m.SaveAlertsCommand{
+ OrgId: cmd.OrgId,
+ UserId: cmd.UserId,
+ DashboardId: cmd.Dashboard.Id,
+ }
+
+ extractor := NewDashAlertExtractor(cmd.Dashboard, cmd.OrgId)
+
+ if alerts, err := extractor.GetAlerts(); err != nil {
+ return err
+ } else {
+ saveAlerts.Alerts = alerts
+ }
+
+ if err := bus.Dispatch(&saveAlerts); err != nil {
+ return err
+ }
+
+ return nil
+}
diff --git a/pkg/services/alerting/conditions/evaluator.go b/pkg/services/alerting/conditions/evaluator.go
new file mode 100644
index 00000000000..57abb2edd25
--- /dev/null
+++ b/pkg/services/alerting/conditions/evaluator.go
@@ -0,0 +1,135 @@
+package conditions
+
+import (
+ "encoding/json"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/services/alerting"
+ "gopkg.in/guregu/null.v3"
+)
+
+var (
+ defaultTypes []string = []string{"gt", "lt"}
+ rangedTypes []string = []string{"within_range", "outside_range"}
+)
+
+type AlertEvaluator interface {
+ Eval(reducedValue null.Float) bool
+}
+
+type NoValueEvaluator struct{}
+
+func (e *NoValueEvaluator) Eval(reducedValue null.Float) bool {
+ return reducedValue.Valid == false
+}
+
+type ThresholdEvaluator struct {
+ Type string
+ Threshold float64
+}
+
+func newThresholdEvaluator(typ string, model *simplejson.Json) (*ThresholdEvaluator, error) {
+ params := model.Get("params").MustArray()
+ if len(params) == 0 {
+ return nil, alerting.ValidationError{Reason: "Evaluator missing threshold parameter"}
+ }
+
+ firstParam, ok := params[0].(json.Number)
+ if !ok {
+ return nil, alerting.ValidationError{Reason: "Evaluator has invalid parameter"}
+ }
+
+ defaultEval := &ThresholdEvaluator{Type: typ}
+ defaultEval.Threshold, _ = firstParam.Float64()
+ return defaultEval, nil
+}
+
+func (e *ThresholdEvaluator) Eval(reducedValue null.Float) bool {
+ if reducedValue.Valid == false {
+ return false
+ }
+
+ switch e.Type {
+ case "gt":
+ return reducedValue.Float64 > e.Threshold
+ case "lt":
+ return reducedValue.Float64 < e.Threshold
+ }
+
+ return false
+}
+
+type RangedEvaluator struct {
+ Type string
+ Lower float64
+ Upper float64
+}
+
+func newRangedEvaluator(typ string, model *simplejson.Json) (*RangedEvaluator, error) {
+ params := model.Get("params").MustArray()
+ if len(params) == 0 {
+ return nil, alerting.ValidationError{Reason: "Evaluator missing threshold parameter"}
+ }
+
+ firstParam, ok := params[0].(json.Number)
+ if !ok {
+ return nil, alerting.ValidationError{Reason: "Evaluator has invalid parameter"}
+ }
+
+ secondParam, ok := params[1].(json.Number)
+ if !ok {
+ return nil, alerting.ValidationError{Reason: "Evaluator has invalid second parameter"}
+ }
+
+ rangedEval := &RangedEvaluator{Type: typ}
+ rangedEval.Lower, _ = firstParam.Float64()
+ rangedEval.Upper, _ = secondParam.Float64()
+ return rangedEval, nil
+}
+
+func (e *RangedEvaluator) Eval(reducedValue null.Float) bool {
+ if reducedValue.Valid == false {
+ return false
+ }
+
+ floatValue := reducedValue.Float64
+
+ switch e.Type {
+ case "within_range":
+ return (e.Lower < floatValue && e.Upper > floatValue) || (e.Upper < floatValue && e.Lower > floatValue)
+ case "outside_range":
+ return (e.Upper < floatValue && e.Lower < floatValue) || (e.Upper > floatValue && e.Lower > floatValue)
+ }
+
+ return false
+}
+
+func NewAlertEvaluator(model *simplejson.Json) (AlertEvaluator, error) {
+ typ := model.Get("type").MustString()
+ if typ == "" {
+ return nil, alerting.ValidationError{Reason: "Evaluator missing type property"}
+ }
+
+ if inSlice(typ, defaultTypes) {
+ return newThresholdEvaluator(typ, model)
+ }
+
+ if inSlice(typ, rangedTypes) {
+ return newRangedEvaluator(typ, model)
+ }
+
+ if typ == "no_value" {
+ return &NoValueEvaluator{}, nil
+ }
+
+ return nil, alerting.ValidationError{Reason: "Evaluator invalid evaluator type: " + typ}
+}
+
+func inSlice(a string, list []string) bool {
+ for _, b := range list {
+ if b == a {
+ return true
+ }
+ }
+ return false
+}
diff --git a/pkg/services/alerting/conditions/evaluator_test.go b/pkg/services/alerting/conditions/evaluator_test.go
new file mode 100644
index 00000000000..e2a3cb48396
--- /dev/null
+++ b/pkg/services/alerting/conditions/evaluator_test.go
@@ -0,0 +1,63 @@
+package conditions
+
+import (
+ "testing"
+
+ "gopkg.in/guregu/null.v3"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func evalutorScenario(json string, reducedValue float64, datapoints ...float64) bool {
+ jsonModel, err := simplejson.NewJson([]byte(json))
+ So(err, ShouldBeNil)
+
+ evaluator, err := NewAlertEvaluator(jsonModel)
+ So(err, ShouldBeNil)
+
+ return evaluator.Eval(null.FloatFrom(reducedValue))
+}
+
+func TestEvalutors(t *testing.T) {
+ Convey("greater then", t, func() {
+ So(evalutorScenario(`{"type": "gt", "params": [1] }`, 3), ShouldBeTrue)
+ So(evalutorScenario(`{"type": "gt", "params": [3] }`, 1), ShouldBeFalse)
+ })
+
+ Convey("less then", t, func() {
+ So(evalutorScenario(`{"type": "lt", "params": [1] }`, 3), ShouldBeFalse)
+ So(evalutorScenario(`{"type": "lt", "params": [3] }`, 1), ShouldBeTrue)
+ })
+
+ Convey("within_range", t, func() {
+ So(evalutorScenario(`{"type": "within_range", "params": [1, 100] }`, 3), ShouldBeTrue)
+ So(evalutorScenario(`{"type": "within_range", "params": [1, 100] }`, 300), ShouldBeFalse)
+ So(evalutorScenario(`{"type": "within_range", "params": [100, 1] }`, 3), ShouldBeTrue)
+ So(evalutorScenario(`{"type": "within_range", "params": [100, 1] }`, 300), ShouldBeFalse)
+ })
+
+ Convey("outside_range", t, func() {
+ So(evalutorScenario(`{"type": "outside_range", "params": [1, 100] }`, 1000), ShouldBeTrue)
+ So(evalutorScenario(`{"type": "outside_range", "params": [1, 100] }`, 50), ShouldBeFalse)
+ So(evalutorScenario(`{"type": "outside_range", "params": [100, 1] }`, 1000), ShouldBeTrue)
+ So(evalutorScenario(`{"type": "outside_range", "params": [100, 1] }`, 50), ShouldBeFalse)
+ })
+
+ Convey("no_value", t, func() {
+ Convey("should be false if serie have values", func() {
+ So(evalutorScenario(`{"type": "no_value", "params": [] }`, 50), ShouldBeFalse)
+ })
+
+ Convey("should be true when the serie have no value", func() {
+ jsonModel, err := simplejson.NewJson([]byte(`{"type": "no_value", "params": [] }`))
+ So(err, ShouldBeNil)
+
+ evaluator, err := NewAlertEvaluator(jsonModel)
+ So(err, ShouldBeNil)
+
+ So(evaluator.Eval(null.FloatFromPtr(nil)), ShouldBeTrue)
+
+ })
+ })
+}
diff --git a/pkg/services/alerting/conditions/query.go b/pkg/services/alerting/conditions/query.go
new file mode 100644
index 00000000000..d7e0a0c29e3
--- /dev/null
+++ b/pkg/services/alerting/conditions/query.go
@@ -0,0 +1,191 @@
+package conditions
+
+import (
+ "fmt"
+ "strings"
+ "time"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/alerting"
+ "github.com/grafana/grafana/pkg/tsdb"
+)
+
+func init() {
+ alerting.RegisterCondition("query", func(model *simplejson.Json, index int) (alerting.Condition, error) {
+ return NewQueryCondition(model, index)
+ })
+}
+
+type QueryCondition struct {
+ Index int
+ Query AlertQuery
+ Reducer QueryReducer
+ Evaluator AlertEvaluator
+ Operator string
+ HandleRequest tsdb.HandleRequestFunc
+}
+
+type AlertQuery struct {
+ Model *simplejson.Json
+ DatasourceId int64
+ From string
+ To string
+}
+
+func (c *QueryCondition) Eval(context *alerting.EvalContext) (*alerting.ConditionResult, error) {
+ timeRange := tsdb.NewTimeRange(c.Query.From, c.Query.To)
+
+ seriesList, err := c.executeQuery(context, timeRange)
+ if err != nil {
+ return nil, err
+ }
+
+ emptySerieCount := 0
+ evalMatchCount := 0
+ var matches []*alerting.EvalMatch
+ for _, series := range seriesList {
+ reducedValue := c.Reducer.Reduce(series)
+ evalMatch := c.Evaluator.Eval(reducedValue)
+
+ if reducedValue.Valid == false {
+ emptySerieCount++
+ continue
+ }
+
+ if context.IsTestRun {
+ context.Logs = append(context.Logs, &alerting.ResultLogEntry{
+ Message: fmt.Sprintf("Condition[%d]: Eval: %v, Metric: %s, Value: %1.3f", c.Index, evalMatch, series.Name, reducedValue.Float64),
+ })
+ }
+
+ if evalMatch {
+ evalMatchCount++
+
+ matches = append(matches, &alerting.EvalMatch{
+ Metric: series.Name,
+ Value: reducedValue.Float64,
+ })
+ }
+ }
+
+ return &alerting.ConditionResult{
+ Firing: evalMatchCount > 0,
+ NoDataFound: emptySerieCount == len(seriesList),
+ Operator: c.Operator,
+ EvalMatches: matches,
+ }, nil
+}
+
+func (c *QueryCondition) executeQuery(context *alerting.EvalContext, timeRange *tsdb.TimeRange) (tsdb.TimeSeriesSlice, error) {
+ getDsInfo := &m.GetDataSourceByIdQuery{
+ Id: c.Query.DatasourceId,
+ OrgId: context.Rule.OrgId,
+ }
+
+ if err := bus.Dispatch(getDsInfo); err != nil {
+ return nil, fmt.Errorf("Could not find datasource")
+ }
+
+ req := c.getRequestForAlertRule(getDsInfo.Result, timeRange)
+ result := make(tsdb.TimeSeriesSlice, 0)
+
+ resp, err := c.HandleRequest(context.Ctx, req)
+ if err != nil {
+ return nil, fmt.Errorf("tsdb.HandleRequest() error %v", err)
+ }
+
+ for _, v := range resp.Results {
+ if v.Error != nil {
+ return nil, fmt.Errorf("tsdb.HandleRequest() response error %v", v)
+ }
+
+ result = append(result, v.Series...)
+
+ if context.IsTestRun {
+ context.Logs = append(context.Logs, &alerting.ResultLogEntry{
+ Message: fmt.Sprintf("Condition[%d]: Query Result", c.Index),
+ Data: v.Series,
+ })
+ }
+ }
+
+ return result, nil
+}
+
+func (c *QueryCondition) getRequestForAlertRule(datasource *m.DataSource, timeRange *tsdb.TimeRange) *tsdb.Request {
+ req := &tsdb.Request{
+ TimeRange: timeRange,
+ Queries: []*tsdb.Query{
+ {
+ RefId: "A",
+ Model: c.Query.Model,
+ DataSource: datasource,
+ },
+ },
+ }
+
+ return req
+}
+
+func NewQueryCondition(model *simplejson.Json, index int) (*QueryCondition, error) {
+ condition := QueryCondition{}
+ condition.Index = index
+ condition.HandleRequest = tsdb.HandleRequest
+
+ queryJson := model.Get("query")
+
+ condition.Query.Model = queryJson.Get("model")
+ condition.Query.From = queryJson.Get("params").MustArray()[1].(string)
+ condition.Query.To = queryJson.Get("params").MustArray()[2].(string)
+
+ if err := validateFromValue(condition.Query.From); err != nil {
+ return nil, err
+ }
+
+ if err := validateToValue(condition.Query.To); err != nil {
+ return nil, err
+ }
+
+ condition.Query.DatasourceId = queryJson.Get("datasourceId").MustInt64()
+
+ reducerJson := model.Get("reducer")
+ condition.Reducer = NewSimpleReducer(reducerJson.Get("type").MustString())
+
+ evaluatorJson := model.Get("evaluator")
+ evaluator, err := NewAlertEvaluator(evaluatorJson)
+ if err != nil {
+ return nil, err
+ }
+ condition.Evaluator = evaluator
+
+ operatorJson := model.Get("operator")
+ operator := operatorJson.Get("type").MustString("and")
+ condition.Operator = operator
+
+ return &condition, nil
+}
+
+func validateFromValue(from string) error {
+ fromRaw := strings.Replace(from, "now-", "", 1)
+
+ _, err := time.ParseDuration("-" + fromRaw)
+ return err
+}
+
+func validateToValue(to string) error {
+ if to == "now" {
+ return nil
+ } else if strings.HasPrefix(to, "now-") {
+ withoutNow := strings.Replace(to, "now-", "", 1)
+
+ _, err := time.ParseDuration("-" + withoutNow)
+ if err == nil {
+ return nil
+ }
+ }
+
+ _, err := time.ParseDuration(to)
+ return err
+}
diff --git a/pkg/services/alerting/conditions/query_test.go b/pkg/services/alerting/conditions/query_test.go
new file mode 100644
index 00000000000..c3797beaf37
--- /dev/null
+++ b/pkg/services/alerting/conditions/query_test.go
@@ -0,0 +1,167 @@
+package conditions
+
+import (
+ "context"
+ "testing"
+
+ null "gopkg.in/guregu/null.v3"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/alerting"
+ "github.com/grafana/grafana/pkg/tsdb"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestQueryCondition(t *testing.T) {
+
+ Convey("when evaluating query condition", t, func() {
+
+ queryConditionScenario("Given avg() and > 100", func(ctx *queryConditionTestContext) {
+
+ ctx.reducer = `{"type": "avg"}`
+ ctx.evaluator = `{"type": "gt", "params": [100]}`
+
+ Convey("Can read query condition from json model", func() {
+ ctx.exec()
+
+ So(ctx.condition.Query.From, ShouldEqual, "5m")
+ So(ctx.condition.Query.To, ShouldEqual, "now")
+ So(ctx.condition.Query.DatasourceId, ShouldEqual, 1)
+
+ Convey("Can read query reducer", func() {
+ reducer, ok := ctx.condition.Reducer.(*SimpleReducer)
+ So(ok, ShouldBeTrue)
+ So(reducer.Type, ShouldEqual, "avg")
+ })
+
+ Convey("Can read evaluator", func() {
+ evaluator, ok := ctx.condition.Evaluator.(*ThresholdEvaluator)
+ So(ok, ShouldBeTrue)
+ So(evaluator.Type, ShouldEqual, "gt")
+ })
+ })
+
+ Convey("should fire when avg is above 100", func() {
+ points := tsdb.NewTimeSeriesPointsFromArgs(120, 0)
+ ctx.series = tsdb.TimeSeriesSlice{tsdb.NewTimeSeries("test1", points)}
+ cr, err := ctx.exec()
+
+ So(err, ShouldBeNil)
+ So(cr.Firing, ShouldBeTrue)
+ })
+
+ Convey("Should not fire when avg is below 100", func() {
+ points := tsdb.NewTimeSeriesPointsFromArgs(90, 0)
+ ctx.series = tsdb.TimeSeriesSlice{tsdb.NewTimeSeries("test1", points)}
+ cr, err := ctx.exec()
+
+ So(err, ShouldBeNil)
+ So(cr.Firing, ShouldBeFalse)
+ })
+
+ Convey("Should fire if only first serie matches", func() {
+ ctx.series = tsdb.TimeSeriesSlice{
+ tsdb.NewTimeSeries("test1", tsdb.NewTimeSeriesPointsFromArgs(120, 0)),
+ tsdb.NewTimeSeries("test2", tsdb.NewTimeSeriesPointsFromArgs(0, 0)),
+ }
+ cr, err := ctx.exec()
+
+ So(err, ShouldBeNil)
+ So(cr.Firing, ShouldBeTrue)
+ })
+
+ Convey("Empty series", func() {
+ Convey("Should set NoDataFound both series are empty", func() {
+ ctx.series = tsdb.TimeSeriesSlice{
+ tsdb.NewTimeSeries("test1", tsdb.NewTimeSeriesPointsFromArgs()),
+ tsdb.NewTimeSeries("test2", tsdb.NewTimeSeriesPointsFromArgs()),
+ }
+ cr, err := ctx.exec()
+
+ So(err, ShouldBeNil)
+ So(cr.NoDataFound, ShouldBeTrue)
+ })
+
+ Convey("Should set NoDataFound both series contains null", func() {
+ ctx.series = tsdb.TimeSeriesSlice{
+ tsdb.NewTimeSeries("test1", tsdb.TimeSeriesPoints{tsdb.TimePoint{null.FloatFromPtr(nil), null.FloatFrom(0)}}),
+ tsdb.NewTimeSeries("test2", tsdb.TimeSeriesPoints{tsdb.TimePoint{null.FloatFromPtr(nil), null.FloatFrom(0)}}),
+ }
+ cr, err := ctx.exec()
+
+ So(err, ShouldBeNil)
+ So(cr.NoDataFound, ShouldBeTrue)
+ })
+
+ Convey("Should not set NoDataFound if one serie is empty", func() {
+ ctx.series = tsdb.TimeSeriesSlice{
+ tsdb.NewTimeSeries("test1", tsdb.NewTimeSeriesPointsFromArgs()),
+ tsdb.NewTimeSeries("test2", tsdb.NewTimeSeriesPointsFromArgs(120, 0)),
+ }
+ cr, err := ctx.exec()
+
+ So(err, ShouldBeNil)
+ So(cr.NoDataFound, ShouldBeFalse)
+ })
+ })
+ })
+ })
+}
+
+type queryConditionTestContext struct {
+ reducer string
+ evaluator string
+ series tsdb.TimeSeriesSlice
+ result *alerting.EvalContext
+ condition *QueryCondition
+}
+
+type queryConditionScenarioFunc func(c *queryConditionTestContext)
+
+func (ctx *queryConditionTestContext) exec() (*alerting.ConditionResult, error) {
+ jsonModel, err := simplejson.NewJson([]byte(`{
+ "type": "query",
+ "query": {
+ "params": ["A", "5m", "now"],
+ "datasourceId": 1,
+ "model": {"target": "aliasByNode(statsd.fakesite.counters.session_start.mobile.count, 4)"}
+ },
+ "reducer":` + ctx.reducer + `,
+ "evaluator":` + ctx.evaluator + `
+ }`))
+ So(err, ShouldBeNil)
+
+ condition, err := NewQueryCondition(jsonModel, 0)
+ So(err, ShouldBeNil)
+
+ ctx.condition = condition
+
+ condition.HandleRequest = func(context context.Context, req *tsdb.Request) (*tsdb.Response, error) {
+ return &tsdb.Response{
+ Results: map[string]*tsdb.QueryResult{
+ "A": {Series: ctx.series},
+ },
+ }, nil
+ }
+
+ return condition.Eval(ctx.result)
+}
+
+func queryConditionScenario(desc string, fn queryConditionScenarioFunc) {
+ Convey(desc, func() {
+
+ bus.AddHandler("test", func(query *m.GetDataSourceByIdQuery) error {
+ query.Result = &m.DataSource{Id: 1, Type: "graphite"}
+ return nil
+ })
+
+ ctx := &queryConditionTestContext{}
+ ctx.result = &alerting.EvalContext{
+ Rule: &alerting.Rule{},
+ }
+
+ fn(ctx)
+ })
+}
diff --git a/pkg/services/alerting/conditions/reducer.go b/pkg/services/alerting/conditions/reducer.go
new file mode 100644
index 00000000000..b7816a61d1d
--- /dev/null
+++ b/pkg/services/alerting/conditions/reducer.go
@@ -0,0 +1,108 @@
+package conditions
+
+import (
+ "math"
+
+ "sort"
+
+ "github.com/grafana/grafana/pkg/tsdb"
+ "gopkg.in/guregu/null.v3"
+)
+
+type QueryReducer interface {
+ Reduce(timeSeries *tsdb.TimeSeries) null.Float
+}
+
+type SimpleReducer struct {
+ Type string
+}
+
+func (s *SimpleReducer) Reduce(series *tsdb.TimeSeries) null.Float {
+ if len(series.Points) == 0 {
+ return null.FloatFromPtr(nil)
+ }
+
+ value := float64(0)
+ allNull := true
+
+ switch s.Type {
+ case "avg":
+ validPointsCount := 0
+ for _, point := range series.Points {
+ if point[0].Valid {
+ value += point[0].Float64
+ validPointsCount += 1
+ allNull = false
+ }
+ }
+ if validPointsCount > 0 {
+ value = value / float64(validPointsCount)
+ }
+ case "sum":
+ for _, point := range series.Points {
+ if point[0].Valid {
+ value += point[0].Float64
+ allNull = false
+ }
+ }
+ case "min":
+ value = math.MaxFloat64
+ for _, point := range series.Points {
+ if point[0].Valid {
+ allNull = false
+ if value > point[0].Float64 {
+ value = point[0].Float64
+ }
+ }
+ }
+ case "max":
+ value = -math.MaxFloat64
+ for _, point := range series.Points {
+ if point[0].Valid {
+ allNull = false
+ if value < point[0].Float64 {
+ value = point[0].Float64
+ }
+ }
+ }
+ case "count":
+ value = float64(len(series.Points))
+ allNull = false
+ case "last":
+ points := series.Points
+ for i := len(points) - 1; i >= 0; i-- {
+ if points[i][0].Valid {
+ value = points[i][0].Float64
+ allNull = false
+ break
+ }
+ }
+ case "median":
+ var values []float64
+ for _, v := range series.Points {
+ if v[0].Valid {
+ allNull = false
+ values = append(values, v[0].Float64)
+ }
+ }
+ if len(values) >= 1 {
+ sort.Float64s(values)
+ length := len(values)
+ if length%2 == 1 {
+ value = values[(length-1)/2]
+ } else {
+ value = (values[(length/2)-1] + values[length/2]) / 2
+ }
+ }
+ }
+
+ if allNull {
+ return null.FloatFromPtr(nil)
+ }
+
+ return null.FloatFrom(value)
+}
+
+func NewSimpleReducer(typ string) *SimpleReducer {
+ return &SimpleReducer{Type: typ}
+}
diff --git a/pkg/services/alerting/conditions/reducer_test.go b/pkg/services/alerting/conditions/reducer_test.go
new file mode 100644
index 00000000000..7d6cee466fc
--- /dev/null
+++ b/pkg/services/alerting/conditions/reducer_test.go
@@ -0,0 +1,87 @@
+package conditions
+
+import (
+ "testing"
+
+ "gopkg.in/guregu/null.v3"
+
+ "github.com/grafana/grafana/pkg/tsdb"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestSimpleReducer(t *testing.T) {
+ Convey("Test simple reducer by calculating", t, func() {
+
+ Convey("sum", func() {
+ result := testReducer("sum", 1, 2, 3)
+ So(result, ShouldEqual, float64(6))
+ })
+
+ Convey("min", func() {
+ result := testReducer("min", 3, 2, 1)
+ So(result, ShouldEqual, float64(1))
+ })
+
+ Convey("max", func() {
+ result := testReducer("max", 1, 2, 3)
+ So(result, ShouldEqual, float64(3))
+ })
+
+ Convey("count", func() {
+ result := testReducer("count", 1, 2, 3000)
+ So(result, ShouldEqual, float64(3))
+ })
+
+ Convey("last", func() {
+ result := testReducer("last", 1, 2, 3000)
+ So(result, ShouldEqual, float64(3000))
+ })
+
+ Convey("median odd amount of numbers", func() {
+ result := testReducer("median", 1, 2, 3000)
+ So(result, ShouldEqual, float64(2))
+ })
+
+ Convey("median even amount of numbers", func() {
+ result := testReducer("median", 1, 2, 4, 3000)
+ So(result, ShouldEqual, float64(3))
+ })
+
+ Convey("median with one values", func() {
+ result := testReducer("median", 1)
+ So(result, ShouldEqual, float64(1))
+ })
+
+ Convey("avg", func() {
+ result := testReducer("avg", 1, 2, 3)
+ So(result, ShouldEqual, float64(2))
+ })
+
+ Convey("avg of number values and null values should ignore nulls", func() {
+ reducer := NewSimpleReducer("avg")
+ series := &tsdb.TimeSeries{
+ Name: "test time serie",
+ }
+
+ series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(3), 1))
+ series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFromPtr(nil), 2))
+ series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFromPtr(nil), 3))
+ series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(3), 4))
+
+ So(reducer.Reduce(series).Float64, ShouldEqual, float64(3))
+ })
+ })
+}
+
+func testReducer(typ string, datapoints ...float64) float64 {
+ reducer := NewSimpleReducer(typ)
+ series := &tsdb.TimeSeries{
+ Name: "test time serie",
+ }
+
+ for idx := range datapoints {
+ series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(datapoints[idx]), 1234134))
+ }
+
+ return reducer.Reduce(series).Float64
+}
diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go
new file mode 100644
index 00000000000..b99b7506614
--- /dev/null
+++ b/pkg/services/alerting/engine.go
@@ -0,0 +1,137 @@
+package alerting
+
+import (
+ "context"
+ "time"
+
+ "github.com/benbjohnson/clock"
+ "github.com/grafana/grafana/pkg/log"
+ "golang.org/x/sync/errgroup"
+)
+
+type Engine struct {
+ execQueue chan *Job
+ clock clock.Clock
+ ticker *Ticker
+ scheduler Scheduler
+ evalHandler EvalHandler
+ ruleReader RuleReader
+ log log.Logger
+ resultHandler ResultHandler
+}
+
+func NewEngine() *Engine {
+ e := &Engine{
+ ticker: NewTicker(time.Now(), time.Second*0, clock.New()),
+ execQueue: make(chan *Job, 1000),
+ scheduler: NewScheduler(),
+ evalHandler: NewEvalHandler(),
+ ruleReader: NewRuleReader(),
+ log: log.New("alerting.engine"),
+ resultHandler: NewResultHandler(),
+ }
+
+ return e
+}
+
+func (e *Engine) Run(ctx context.Context) error {
+ e.log.Info("Initializing Alerting")
+
+ alertGroup, ctx := errgroup.WithContext(ctx)
+
+ alertGroup.Go(func() error { return e.alertingTicker(ctx) })
+ alertGroup.Go(func() error { return e.runJobDispatcher(ctx) })
+
+ err := alertGroup.Wait()
+
+ e.log.Info("Stopped Alerting", "reason", err)
+ return err
+}
+
+func (e *Engine) alertingTicker(grafanaCtx context.Context) error {
+ defer func() {
+ if err := recover(); err != nil {
+ e.log.Error("Scheduler Panic: stopping alertingTicker", "error", err, "stack", log.Stack(1))
+ }
+ }()
+
+ tickIndex := 0
+
+ for {
+ select {
+ case <-grafanaCtx.Done():
+ return grafanaCtx.Err()
+ case tick := <-e.ticker.C:
+ // TEMP SOLUTION update rules ever tenth tick
+ if tickIndex%10 == 0 {
+ e.scheduler.Update(e.ruleReader.Fetch())
+ }
+
+ e.scheduler.Tick(tick, e.execQueue)
+ tickIndex++
+ }
+ }
+}
+
+func (e *Engine) runJobDispatcher(grafanaCtx context.Context) error {
+ dispatcherGroup, alertCtx := errgroup.WithContext(grafanaCtx)
+
+ for {
+ select {
+ case <-grafanaCtx.Done():
+ return dispatcherGroup.Wait()
+ case job := <-e.execQueue:
+ dispatcherGroup.Go(func() error { return e.processJob(alertCtx, job) })
+ }
+ }
+}
+
+var (
+ unfinishedWorkTimeout time.Duration = time.Second * 5
+ alertTimeout time.Duration = time.Second * 30
+)
+
+func (e *Engine) processJob(grafanaCtx context.Context, job *Job) error {
+ defer func() {
+ if err := recover(); err != nil {
+ e.log.Error("Alert Panic", "error", err, "stack", log.Stack(1))
+ }
+ }()
+
+ alertCtx, cancelFn := context.WithTimeout(context.TODO(), alertTimeout)
+
+ job.Running = true
+ evalContext := NewEvalContext(alertCtx, job.Rule)
+
+ done := make(chan struct{})
+
+ go func() {
+ defer func() {
+ if err := recover(); err != nil {
+ e.log.Error("Alert Panic", "error", err, "stack", log.Stack(1))
+ close(done)
+ }
+ }()
+
+ e.evalHandler.Eval(evalContext)
+ e.resultHandler.Handle(evalContext)
+ close(done)
+ }()
+
+ var err error = nil
+ select {
+ case <-grafanaCtx.Done():
+ select {
+ case <-time.After(unfinishedWorkTimeout):
+ cancelFn()
+ err = grafanaCtx.Err()
+ case <-done:
+ }
+ case <-done:
+ }
+
+ e.log.Debug("Job Execution completed", "timeMs", evalContext.GetDurationMs(), "alertId", evalContext.Rule.Id, "name", evalContext.Rule.Name, "firing", evalContext.Firing)
+ job.Running = false
+ cancelFn()
+ return err
+}
diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go
new file mode 100644
index 00000000000..2b252da8c4b
--- /dev/null
+++ b/pkg/services/alerting/eval_context.go
@@ -0,0 +1,119 @@
+package alerting
+
+import (
+ "context"
+ "fmt"
+ "time"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/log"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+type EvalContext struct {
+ Firing bool
+ IsTestRun bool
+ EvalMatches []*EvalMatch
+ Logs []*ResultLogEntry
+ Error error
+ ConditionEvals string
+ StartTime time.Time
+ EndTime time.Time
+ Rule *Rule
+ log log.Logger
+ dashboardSlug string
+ ImagePublicUrl string
+ ImageOnDiskPath string
+ NoDataFound bool
+ PrevAlertState m.AlertStateType
+
+ Ctx context.Context
+}
+
+func NewEvalContext(alertCtx context.Context, rule *Rule) *EvalContext {
+ return &EvalContext{
+ Ctx: alertCtx,
+ StartTime: time.Now(),
+ Rule: rule,
+ Logs: make([]*ResultLogEntry, 0),
+ EvalMatches: make([]*EvalMatch, 0),
+ log: log.New("alerting.evalContext"),
+ PrevAlertState: rule.State,
+ }
+}
+
+type StateDescription struct {
+ Color string
+ Text string
+ Data string
+}
+
+func (c *EvalContext) GetStateModel() *StateDescription {
+ switch c.Rule.State {
+ case m.AlertStateOK:
+ return &StateDescription{
+ Color: "#36a64f",
+ Text: "OK",
+ }
+ case m.AlertStateNoData:
+ return &StateDescription{
+ Color: "#888888",
+ Text: "No Data",
+ }
+ case m.AlertStateAlerting:
+ return &StateDescription{
+ Color: "#D63232",
+ Text: "Alerting",
+ }
+ default:
+ panic("Unknown rule state " + c.Rule.State)
+ }
+}
+
+func (c *EvalContext) ShouldUpdateAlertState() bool {
+ return c.Rule.State != c.PrevAlertState
+}
+
+func (c *EvalContext) ShouldSendNotification() bool {
+ if (c.PrevAlertState == m.AlertStatePending) && (c.Rule.State == m.AlertStateOK) {
+ return false
+ }
+
+ return true
+}
+
+func (a *EvalContext) GetDurationMs() float64 {
+ return float64(a.EndTime.Nanosecond()-a.StartTime.Nanosecond()) / float64(1000000)
+}
+
+func (c *EvalContext) GetNotificationTitle() string {
+ return "[" + c.GetStateModel().Text + "] " + c.Rule.Name
+}
+
+func (c *EvalContext) GetDashboardSlug() (string, error) {
+ if c.dashboardSlug != "" {
+ return c.dashboardSlug, nil
+ }
+
+ slugQuery := &m.GetDashboardSlugByIdQuery{Id: c.Rule.DashboardId}
+ if err := bus.Dispatch(slugQuery); err != nil {
+ return "", err
+ }
+
+ c.dashboardSlug = slugQuery.Result
+ return c.dashboardSlug, nil
+}
+
+func (c *EvalContext) GetRuleUrl() (string, error) {
+ if c.IsTestRun {
+ return setting.AppUrl, nil
+ }
+
+ if slug, err := c.GetDashboardSlug(); err != nil {
+ return "", err
+ } else {
+ ruleUrl := fmt.Sprintf("%sdashboard/db/%s?fullscreen&edit&tab=alert&panelId=%d", setting.AppUrl, slug, c.Rule.PanelId)
+ return ruleUrl, nil
+ }
+}
diff --git a/pkg/services/alerting/eval_context_test.go b/pkg/services/alerting/eval_context_test.go
new file mode 100644
index 00000000000..5cff2996ca6
--- /dev/null
+++ b/pkg/services/alerting/eval_context_test.go
@@ -0,0 +1,48 @@
+package alerting
+
+import (
+ "context"
+ "testing"
+
+ "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestAlertingEvalContext(t *testing.T) {
+ Convey("Eval context", t, func() {
+ ctx := NewEvalContext(context.TODO(), &Rule{Conditions: []Condition{&conditionStub{firing: true}}})
+
+ Convey("Should update alert state", func() {
+
+ Convey("ok -> alerting", func() {
+ ctx.PrevAlertState = models.AlertStateOK
+ ctx.Rule.State = models.AlertStateAlerting
+
+ So(ctx.ShouldUpdateAlertState(), ShouldBeTrue)
+ })
+
+ Convey("ok -> ok", func() {
+ ctx.PrevAlertState = models.AlertStateOK
+ ctx.Rule.State = models.AlertStateOK
+
+ So(ctx.ShouldUpdateAlertState(), ShouldBeFalse)
+ })
+ })
+
+ Convey("Should send notifications", func() {
+ Convey("pending -> ok", func() {
+ ctx.PrevAlertState = models.AlertStatePending
+ ctx.Rule.State = models.AlertStateOK
+
+ So(ctx.ShouldSendNotification(), ShouldBeFalse)
+ })
+
+ Convey("ok -> alerting", func() {
+ ctx.PrevAlertState = models.AlertStateOK
+ ctx.Rule.State = models.AlertStateAlerting
+
+ So(ctx.ShouldSendNotification(), ShouldBeTrue)
+ })
+ })
+ })
+}
diff --git a/pkg/services/alerting/eval_handler.go b/pkg/services/alerting/eval_handler.go
new file mode 100644
index 00000000000..867226738b8
--- /dev/null
+++ b/pkg/services/alerting/eval_handler.go
@@ -0,0 +1,65 @@
+package alerting
+
+import (
+ "strconv"
+ "strings"
+ "time"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/metrics"
+)
+
+type DefaultEvalHandler struct {
+ log log.Logger
+ alertJobTimeout time.Duration
+}
+
+func NewEvalHandler() *DefaultEvalHandler {
+ return &DefaultEvalHandler{
+ log: log.New("alerting.evalHandler"),
+ alertJobTimeout: time.Second * 5,
+ }
+}
+
+func (e *DefaultEvalHandler) Eval(context *EvalContext) {
+ firing := true
+ noDataFound := true
+ conditionEvals := ""
+
+ for i := 0; i < len(context.Rule.Conditions); i++ {
+ condition := context.Rule.Conditions[i]
+ cr, err := condition.Eval(context)
+ if err != nil {
+ context.Error = err
+ }
+
+ // break if condition could not be evaluated
+ if context.Error != nil {
+ break
+ }
+
+ // calculating Firing based on operator
+ if cr.Operator == "or" {
+ firing = firing || cr.Firing
+ noDataFound = noDataFound || cr.NoDataFound
+ } else {
+ firing = firing && cr.Firing
+ noDataFound = noDataFound && cr.NoDataFound
+ }
+
+ if i > 0 {
+ conditionEvals = "[" + conditionEvals + " " + strings.ToUpper(cr.Operator) + " " + strconv.FormatBool(cr.Firing) + "]"
+ } else {
+ conditionEvals = strconv.FormatBool(firing)
+ }
+
+ context.EvalMatches = append(context.EvalMatches, cr.EvalMatches...)
+ }
+
+ context.ConditionEvals = conditionEvals + " = " + strconv.FormatBool(firing)
+ context.Firing = firing
+ context.NoDataFound = noDataFound
+ context.EndTime = time.Now()
+ elapsedTime := context.EndTime.Sub(context.StartTime) / time.Millisecond
+ metrics.M_Alerting_Execution_Time.Update(elapsedTime)
+}
diff --git a/pkg/services/alerting/eval_handler_test.go b/pkg/services/alerting/eval_handler_test.go
new file mode 100644
index 00000000000..73d675e3fa7
--- /dev/null
+++ b/pkg/services/alerting/eval_handler_test.go
@@ -0,0 +1,168 @@
+package alerting
+
+import (
+ "context"
+ "testing"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+type conditionStub struct {
+ firing bool
+ operator string
+ matches []*EvalMatch
+ noData bool
+}
+
+func (c *conditionStub) Eval(context *EvalContext) (*ConditionResult, error) {
+ return &ConditionResult{Firing: c.firing, EvalMatches: c.matches, Operator: c.operator, NoDataFound: c.noData}, nil
+}
+
+func TestAlertingExecutor(t *testing.T) {
+ Convey("Test alert execution", t, func() {
+ handler := NewEvalHandler()
+
+ Convey("Show return triggered with single passing condition", func() {
+ context := NewEvalContext(context.TODO(), &Rule{
+ Conditions: []Condition{&conditionStub{
+ firing: true,
+ }},
+ })
+
+ handler.Eval(context)
+ So(context.Firing, ShouldEqual, true)
+ So(context.ConditionEvals, ShouldEqual, "true = true")
+ })
+
+ Convey("Show return false with not passing asdf", func() {
+ context := NewEvalContext(context.TODO(), &Rule{
+ Conditions: []Condition{
+ &conditionStub{firing: true, operator: "and", matches: []*EvalMatch{&EvalMatch{}, &EvalMatch{}}},
+ &conditionStub{firing: false, operator: "and"},
+ },
+ })
+
+ handler.Eval(context)
+ So(context.Firing, ShouldEqual, false)
+ So(context.ConditionEvals, ShouldEqual, "[true AND false] = false")
+ })
+
+ Convey("Show return true if any of the condition is passing with OR operator", func() {
+ context := NewEvalContext(context.TODO(), &Rule{
+ Conditions: []Condition{
+ &conditionStub{firing: true, operator: "and"},
+ &conditionStub{firing: false, operator: "or"},
+ },
+ })
+
+ handler.Eval(context)
+ So(context.Firing, ShouldEqual, true)
+ So(context.ConditionEvals, ShouldEqual, "[true OR false] = true")
+ })
+
+ Convey("Show return false if any of the condition is failing with AND operator", func() {
+ context := NewEvalContext(context.TODO(), &Rule{
+ Conditions: []Condition{
+ &conditionStub{firing: true, operator: "and"},
+ &conditionStub{firing: false, operator: "and"},
+ },
+ })
+
+ handler.Eval(context)
+ So(context.Firing, ShouldEqual, false)
+ So(context.ConditionEvals, ShouldEqual, "[true AND false] = false")
+ })
+
+ Convey("Show return true if one condition is failing with nested OR operator", func() {
+ context := NewEvalContext(context.TODO(), &Rule{
+ Conditions: []Condition{
+ &conditionStub{firing: true, operator: "and"},
+ &conditionStub{firing: true, operator: "and"},
+ &conditionStub{firing: false, operator: "or"},
+ },
+ })
+
+ handler.Eval(context)
+ So(context.Firing, ShouldEqual, true)
+ So(context.ConditionEvals, ShouldEqual, "[[true AND true] OR false] = true")
+ })
+
+ Convey("Show return false if one condition is passing with nested OR operator", func() {
+ context := NewEvalContext(context.TODO(), &Rule{
+ Conditions: []Condition{
+ &conditionStub{firing: true, operator: "and"},
+ &conditionStub{firing: false, operator: "and"},
+ &conditionStub{firing: false, operator: "or"},
+ },
+ })
+
+ handler.Eval(context)
+ So(context.Firing, ShouldEqual, false)
+ So(context.ConditionEvals, ShouldEqual, "[[true AND false] OR false] = false")
+ })
+
+ Convey("Show return false if a condition is failing with nested AND operator", func() {
+ context := NewEvalContext(context.TODO(), &Rule{
+ Conditions: []Condition{
+ &conditionStub{firing: true, operator: "and"},
+ &conditionStub{firing: false, operator: "and"},
+ &conditionStub{firing: true, operator: "and"},
+ },
+ })
+
+ handler.Eval(context)
+ So(context.Firing, ShouldEqual, false)
+ So(context.ConditionEvals, ShouldEqual, "[[true AND false] AND true] = false")
+ })
+
+ Convey("Show return true if a condition is passing with nested OR operator", func() {
+ context := NewEvalContext(context.TODO(), &Rule{
+ Conditions: []Condition{
+ &conditionStub{firing: true, operator: "and"},
+ &conditionStub{firing: false, operator: "or"},
+ &conditionStub{firing: true, operator: "or"},
+ },
+ })
+
+ handler.Eval(context)
+ So(context.Firing, ShouldEqual, true)
+ So(context.ConditionEvals, ShouldEqual, "[[true OR false] OR true] = true")
+ })
+
+ Convey("Should return no data if one condition has nodata", func() {
+ context := NewEvalContext(context.TODO(), &Rule{
+ Conditions: []Condition{
+ &conditionStub{operator: "and", noData: true},
+ },
+ })
+
+ handler.Eval(context)
+ So(context.Firing, ShouldEqual, false)
+ So(context.NoDataFound, ShouldBeTrue)
+ })
+
+ Convey("Should return no data if both conditions have no data and using AND", func() {
+ context := NewEvalContext(context.TODO(), &Rule{
+ Conditions: []Condition{
+ &conditionStub{operator: "and", noData: true},
+ &conditionStub{operator: "and", noData: false},
+ },
+ })
+
+ handler.Eval(context)
+ So(context.NoDataFound, ShouldBeFalse)
+ })
+
+ Convey("Should not return no data if both conditions have no data and using OR", func() {
+ context := NewEvalContext(context.TODO(), &Rule{
+ Conditions: []Condition{
+ &conditionStub{operator: "or", noData: true},
+ &conditionStub{operator: "or", noData: false},
+ },
+ })
+
+ handler.Eval(context)
+ So(context.NoDataFound, ShouldBeTrue)
+ })
+ })
+}
diff --git a/pkg/services/alerting/extractor.go b/pkg/services/alerting/extractor.go
new file mode 100644
index 00000000000..6e064c8cf76
--- /dev/null
+++ b/pkg/services/alerting/extractor.go
@@ -0,0 +1,147 @@
+package alerting
+
+import (
+ "errors"
+
+ "fmt"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/log"
+ m "github.com/grafana/grafana/pkg/models"
+)
+
+type DashAlertExtractor struct {
+ Dash *m.Dashboard
+ OrgId int64
+ log log.Logger
+}
+
+func NewDashAlertExtractor(dash *m.Dashboard, orgId int64) *DashAlertExtractor {
+ return &DashAlertExtractor{
+ Dash: dash,
+ OrgId: orgId,
+ log: log.New("alerting.extractor"),
+ }
+}
+
+func (e *DashAlertExtractor) lookupDatasourceId(dsName string) (*m.DataSource, error) {
+ if dsName == "" {
+ query := &m.GetDataSourcesQuery{OrgId: e.OrgId}
+ if err := bus.Dispatch(query); err != nil {
+ return nil, err
+ } else {
+ for _, ds := range query.Result {
+ if ds.IsDefault {
+ return ds, nil
+ }
+ }
+ }
+ } else {
+ query := &m.GetDataSourceByNameQuery{Name: dsName, OrgId: e.OrgId}
+ if err := bus.Dispatch(query); err != nil {
+ return nil, err
+ } else {
+ return query.Result, nil
+ }
+ }
+
+ return nil, errors.New("Could not find datasource id for " + dsName)
+}
+
+func findPanelQueryByRefId(panel *simplejson.Json, refId string) *simplejson.Json {
+ for _, targetsObj := range panel.Get("targets").MustArray() {
+ target := simplejson.NewFromAny(targetsObj)
+
+ if target.Get("refId").MustString() == refId {
+ return target
+ }
+ }
+ return nil
+}
+
+func (e *DashAlertExtractor) GetAlerts() ([]*m.Alert, error) {
+ e.log.Debug("GetAlerts")
+
+ alerts := make([]*m.Alert, 0)
+
+ for _, rowObj := range e.Dash.Data.Get("rows").MustArray() {
+ row := simplejson.NewFromAny(rowObj)
+
+ for _, panelObj := range row.Get("panels").MustArray() {
+ panel := simplejson.NewFromAny(panelObj)
+ jsonAlert, hasAlert := panel.CheckGet("alert")
+
+ if !hasAlert {
+ continue
+ }
+
+ // backward compatability check, can be removed later
+ enabled, hasEnabled := jsonAlert.CheckGet("enabled")
+ if hasEnabled && enabled.MustBool() == false {
+ continue
+ }
+
+ frequency, err := getTimeDurationStringToSeconds(jsonAlert.Get("frequency").MustString())
+ if err != nil {
+ return nil, ValidationError{Reason: "Could not parse frequency"}
+ }
+
+ alert := &m.Alert{
+ DashboardId: e.Dash.Id,
+ OrgId: e.OrgId,
+ PanelId: panel.Get("id").MustInt64(),
+ Id: jsonAlert.Get("id").MustInt64(),
+ Name: jsonAlert.Get("name").MustString(),
+ Handler: jsonAlert.Get("handler").MustInt64(),
+ Message: jsonAlert.Get("message").MustString(),
+ Frequency: frequency,
+ }
+
+ for _, condition := range jsonAlert.Get("conditions").MustArray() {
+ jsonCondition := simplejson.NewFromAny(condition)
+
+ jsonQuery := jsonCondition.Get("query")
+ queryRefId := jsonQuery.Get("params").MustArray()[0].(string)
+ panelQuery := findPanelQueryByRefId(panel, queryRefId)
+
+ if panelQuery == nil {
+ reason := fmt.Sprintf("Alert on PanelId: %v refers to query(%s) that cannot be found", alert.PanelId, queryRefId)
+ return nil, ValidationError{Reason: reason}
+ }
+
+ dsName := ""
+ if panelQuery.Get("datasource").MustString() != "" {
+ dsName = panelQuery.Get("datasource").MustString()
+ } else if panel.Get("datasource").MustString() != "" {
+ dsName = panel.Get("datasource").MustString()
+ }
+
+ if datasource, err := e.lookupDatasourceId(dsName); err != nil {
+ return nil, err
+ } else {
+ jsonQuery.SetPath([]string{"datasourceId"}, datasource.Id)
+ }
+
+ if interval, err := panel.Get("interval").String(); err == nil {
+ panelQuery.Set("interval", interval)
+ }
+
+ jsonQuery.Set("model", panelQuery.Interface())
+ }
+
+ alert.Settings = jsonAlert
+
+ // validate
+ _, err = NewRuleFromDBAlert(alert)
+ if err == nil && alert.ValidToSave() {
+ alerts = append(alerts, alert)
+ } else {
+ return nil, err
+ }
+ }
+ }
+
+ e.log.Debug("Extracted alerts from dashboard", "alertCount", len(alerts))
+ return alerts, nil
+}
diff --git a/pkg/services/alerting/extractor_test.go b/pkg/services/alerting/extractor_test.go
new file mode 100644
index 00000000000..e72e6d938d8
--- /dev/null
+++ b/pkg/services/alerting/extractor_test.go
@@ -0,0 +1,487 @@
+package alerting
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestAlertRuleExtraction(t *testing.T) {
+
+ Convey("Parsing alert rules from dashboard json", t, func() {
+
+ RegisterCondition("query", func(model *simplejson.Json, index int) (Condition, error) {
+ return &FakeCondition{}, nil
+ })
+
+ setting.NewConfigContext(&setting.CommandLineArgs{
+ HomePath: "../../../",
+ })
+
+ // mock data
+ defaultDs := &m.DataSource{Id: 12, OrgId: 1, Name: "I am default", IsDefault: true}
+ graphite2Ds := &m.DataSource{Id: 15, OrgId: 1, Name: "graphite2"}
+ influxDBDs := &m.DataSource{Id: 16, OrgId: 1, Name: "InfluxDB"}
+
+ bus.AddHandler("test", func(query *m.GetDataSourcesQuery) error {
+ query.Result = []*m.DataSource{defaultDs, graphite2Ds}
+ return nil
+ })
+
+ bus.AddHandler("test", func(query *m.GetDataSourceByNameQuery) error {
+ if query.Name == defaultDs.Name {
+ query.Result = defaultDs
+ }
+ if query.Name == graphite2Ds.Name {
+ query.Result = graphite2Ds
+ }
+ if query.Name == influxDBDs.Name {
+ query.Result = influxDBDs
+ }
+ return nil
+ })
+
+ json := `
+ {
+ "id": 57,
+ "title": "Graphite 4",
+ "originalTitle": "Graphite 4",
+ "tags": ["graphite"],
+ "rows": [
+ {
+ "panels": [
+ {
+ "title": "Active desktop users",
+ "editable": true,
+ "type": "graph",
+ "id": 3,
+ "targets": [
+ {
+ "refId": "A",
+ "target": "aliasByNode(statsd.fakesite.counters.session_start.desktop.count, 4)"
+ }
+ ],
+ "datasource": null,
+ "alert": {
+ "name": "name1",
+ "message": "desc1",
+ "handler": 1,
+ "frequency": "60s",
+ "conditions": [
+ {
+ "type": "query",
+ "query": {"params": ["A", "5m", "now"]},
+ "reducer": {"type": "avg", "params": []},
+ "evaluator": {"type": ">", "params": [100]}
+ }
+ ]
+ }
+ },
+ {
+ "title": "Active mobile users",
+ "id": 4,
+ "targets": [
+ {"refId": "A", "target": ""},
+ {"refId": "B", "target": "aliasByNode(statsd.fakesite.counters.session_start.mobile.count, 4)"}
+ ],
+ "datasource": "graphite2",
+ "alert": {
+ "name": "name2",
+ "message": "desc2",
+ "handler": 0,
+ "frequency": "60s",
+ "severity": "warning",
+ "conditions": [
+ {
+ "type": "query",
+ "query": {"params": ["B", "5m", "now"]},
+ "reducer": {"type": "avg", "params": []},
+ "evaluator": {"type": ">", "params": [100]}
+ }
+ ]
+ }
+ }
+ ]
+ }
+ ]
+ }`
+
+ Convey("Parsing and validating dashboard containing graphite alerts", func() {
+
+ dashJson, err := simplejson.NewJson([]byte(json))
+ So(err, ShouldBeNil)
+
+ dash := m.NewDashboardFromJson(dashJson)
+ extractor := NewDashAlertExtractor(dash, 1)
+
+ alerts, err := extractor.GetAlerts()
+
+ Convey("Get rules without error", func() {
+ So(err, ShouldBeNil)
+ })
+
+ Convey("all properties have been set", func() {
+ So(len(alerts), ShouldEqual, 2)
+
+ for _, v := range alerts {
+ So(v.DashboardId, ShouldEqual, 57)
+ So(v.Name, ShouldNotBeEmpty)
+ So(v.Message, ShouldNotBeEmpty)
+
+ settings := simplejson.NewFromAny(v.Settings)
+ So(settings.Get("interval").MustString(""), ShouldEqual, "")
+ }
+
+ Convey("should extract handler property", func() {
+ So(alerts[0].Handler, ShouldEqual, 1)
+ So(alerts[1].Handler, ShouldEqual, 0)
+ })
+
+ Convey("should extract frequency in seconds", func() {
+ So(alerts[0].Frequency, ShouldEqual, 60)
+ So(alerts[1].Frequency, ShouldEqual, 60)
+ })
+
+ Convey("should extract panel idc", func() {
+ So(alerts[0].PanelId, ShouldEqual, 3)
+ So(alerts[1].PanelId, ShouldEqual, 4)
+ })
+
+ Convey("should extract name and desc", func() {
+ So(alerts[0].Name, ShouldEqual, "name1")
+ So(alerts[0].Message, ShouldEqual, "desc1")
+ So(alerts[1].Name, ShouldEqual, "name2")
+ So(alerts[1].Message, ShouldEqual, "desc2")
+ })
+
+ Convey("should set datasourceId", func() {
+ condition := simplejson.NewFromAny(alerts[0].Settings.Get("conditions").MustArray()[0])
+ query := condition.Get("query")
+ So(query.Get("datasourceId").MustInt64(), ShouldEqual, 12)
+ })
+
+ Convey("should copy query model to condition", func() {
+ condition := simplejson.NewFromAny(alerts[0].Settings.Get("conditions").MustArray()[0])
+ model := condition.Get("query").Get("model")
+ So(model.Get("target").MustString(), ShouldEqual, "aliasByNode(statsd.fakesite.counters.session_start.desktop.count, 4)")
+ })
+ })
+ })
+
+ Convey("Parse and validate dashboard containing influxdb alert", func() {
+
+ json2 := `{
+ "id": 4,
+ "title": "Influxdb",
+ "tags": [
+ "apa"
+ ],
+ "style": "dark",
+ "timezone": "browser",
+ "editable": true,
+ "hideControls": false,
+ "sharedCrosshair": false,
+ "rows": [
+ {
+ "collapse": false,
+ "editable": true,
+ "height": "450px",
+ "panels": [
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 10
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "B",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "frequency": "3s",
+ "handler": 1,
+ "name": "Influxdb",
+ "noDataState": "no_data",
+ "notifications": [
+ {
+ "id": 6
+ }
+ ]
+ },
+ "alerting": {},
+ "aliasColors": {
+ "logins.count.count": "#890F02"
+ },
+ "bars": false,
+ "datasource": "InfluxDB",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "grid": {},
+ "id": 1,
+ "interval": ">10s",
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 10,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "dsType": "influxdb",
+ "groupBy": [
+ {
+ "params": [
+ "$interval"
+ ],
+ "type": "time"
+ },
+ {
+ "params": [
+ "datacenter"
+ ],
+ "type": "tag"
+ },
+ {
+ "params": [
+ "none"
+ ],
+ "type": "fill"
+ }
+ ],
+ "hide": false,
+ "measurement": "logins.count",
+ "policy": "default",
+ "query": "SELECT 8 * count(\"value\") FROM \"logins.count\" WHERE $timeFilter GROUP BY time($interval), \"datacenter\" fill(none)",
+ "rawQuery": true,
+ "refId": "B",
+ "resultFormat": "time_series",
+ "select": [
+ [
+ {
+ "params": [
+ "value"
+ ],
+ "type": "field"
+ },
+ {
+ "params": [],
+ "type": "count"
+ }
+ ]
+ ],
+ "tags": []
+ },
+ {
+ "dsType": "influxdb",
+ "groupBy": [
+ {
+ "params": [
+ "$interval"
+ ],
+ "type": "time"
+ },
+ {
+ "params": [
+ "null"
+ ],
+ "type": "fill"
+ }
+ ],
+ "hide": true,
+ "measurement": "cpu",
+ "policy": "default",
+ "refId": "A",
+ "resultFormat": "time_series",
+ "select": [
+ [
+ {
+ "params": [
+ "value"
+ ],
+ "type": "field"
+ },
+ {
+ "params": [],
+ "type": "mean"
+ }
+ ],
+ [
+ {
+ "params": [
+ "value"
+ ],
+ "type": "field"
+ },
+ {
+ "params": [],
+ "type": "sum"
+ }
+ ]
+ ],
+ "tags": []
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "line": true,
+ "op": "gt",
+ "value": 10
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Panel Title",
+ "tooltip": {
+ "msResolution": false,
+ "ordering": "alphabetical",
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "editable": true,
+ "error": false,
+ "id": 2,
+ "isNew": true,
+ "limit": 10,
+ "links": [],
+ "show": "current",
+ "span": 2,
+ "stateFilter": [
+ "alerting"
+ ],
+ "title": "Alert status",
+ "type": "alertlist"
+ }
+ ],
+ "title": "Row"
+ }
+ ],
+ "time": {
+ "from": "now-5m",
+ "to": "now"
+ },
+ "timepicker": {
+ "now": true,
+ "refresh_intervals": [
+ "5s",
+ "10s",
+ "30s",
+ "1m",
+ "5m",
+ "15m",
+ "30m",
+ "1h",
+ "2h",
+ "1d"
+ ],
+ "time_options": [
+ "5m",
+ "15m",
+ "1h",
+ "6h",
+ "12h",
+ "24h",
+ "2d",
+ "7d",
+ "30d"
+ ]
+ },
+ "templating": {
+ "list": []
+ },
+ "annotations": {
+ "list": []
+ },
+ "schemaVersion": 13,
+ "version": 120,
+ "links": [],
+ "gnetId": null
+ }`
+
+ dashJson, err := simplejson.NewJson([]byte(json2))
+ So(err, ShouldBeNil)
+ dash := m.NewDashboardFromJson(dashJson)
+ extractor := NewDashAlertExtractor(dash, 1)
+
+ alerts, err := extractor.GetAlerts()
+
+ Convey("Get rules without error", func() {
+ So(err, ShouldBeNil)
+ })
+
+ Convey("should be able to read interval", func() {
+ So(len(alerts), ShouldEqual, 1)
+
+ for _, alert := range alerts {
+ So(alert.DashboardId, ShouldEqual, 4)
+
+ conditions := alert.Settings.Get("conditions").MustArray()
+ cond := simplejson.NewFromAny(conditions[0])
+
+ So(cond.Get("query").Get("model").Get("interval").MustString(), ShouldEqual, ">10s")
+ }
+ })
+ })
+ })
+}
diff --git a/pkg/services/alerting/interfaces.go b/pkg/services/alerting/interfaces.go
new file mode 100644
index 00000000000..566fbdb2898
--- /dev/null
+++ b/pkg/services/alerting/interfaces.go
@@ -0,0 +1,33 @@
+package alerting
+
+import "time"
+
+type EvalHandler interface {
+ Eval(evalContext *EvalContext)
+}
+
+type Scheduler interface {
+ Tick(time time.Time, execQueue chan *Job)
+ Update(rules []*Rule)
+}
+
+type Notifier interface {
+ Notify(evalContext *EvalContext) error
+ GetType() string
+ NeedsImage() bool
+ PassesFilter(rule *Rule) bool
+
+ GetNotifierId() int64
+ GetIsDefault() bool
+}
+
+type ConditionResult struct {
+ Firing bool
+ NoDataFound bool
+ Operator string
+ EvalMatches []*EvalMatch
+}
+
+type Condition interface {
+ Eval(result *EvalContext) (*ConditionResult, error)
+}
diff --git a/pkg/services/alerting/models.go b/pkg/services/alerting/models.go
new file mode 100644
index 00000000000..140c545fb2f
--- /dev/null
+++ b/pkg/services/alerting/models.go
@@ -0,0 +1,25 @@
+package alerting
+
+type Job struct {
+ Offset int64
+ OffsetWait bool
+ Delay bool
+ Running bool
+ Rule *Rule
+}
+
+type ResultLogEntry struct {
+ Message string
+ Data interface{}
+}
+
+type EvalMatch struct {
+ Value float64 `json:"value"`
+ Metric string `json:"metric"`
+ Tags map[string]string `json:"tags"`
+}
+
+type Level struct {
+ Operator string
+ Value float64
+}
diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go
new file mode 100644
index 00000000000..7e213058cd0
--- /dev/null
+++ b/pkg/services/alerting/notifier.go
@@ -0,0 +1,177 @@
+package alerting
+
+import (
+ "errors"
+ "fmt"
+
+ "golang.org/x/sync/errgroup"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/imguploader"
+ "github.com/grafana/grafana/pkg/components/renderer"
+ "github.com/grafana/grafana/pkg/log"
+ m "github.com/grafana/grafana/pkg/models"
+)
+
+type NotifierPlugin struct {
+ Type string `json:"type"`
+ Name string `json:"name"`
+ Description string `json:"description"`
+ OptionsTemplate string `json:"optionsTemplate"`
+ Factory NotifierFactory `json:"-"`
+}
+
+type RootNotifier struct {
+ log log.Logger
+}
+
+func NewRootNotifier() *RootNotifier {
+ return &RootNotifier{
+ log: log.New("alerting.notifier"),
+ }
+}
+
+func (n *RootNotifier) GetType() string {
+ return "root"
+}
+
+func (n *RootNotifier) NeedsImage() bool {
+ return false
+}
+
+func (n *RootNotifier) PassesFilter(rule *Rule) bool {
+ return false
+}
+
+func (n *RootNotifier) GetNotifierId() int64 {
+ return 0
+}
+
+func (n *RootNotifier) GetIsDefault() bool {
+ return false
+}
+
+func (n *RootNotifier) Notify(context *EvalContext) error {
+ notifiers, err := n.getNotifiers(context.Rule.OrgId, context.Rule.Notifications, context)
+ if err != nil {
+ return err
+ }
+
+ n.log.Info("Sending notifications for", "ruleId", context.Rule.Id, "sent count", len(notifiers))
+
+ if len(notifiers) == 0 {
+ return nil
+ }
+
+ if err = n.uploadImage(context); err != nil {
+ n.log.Error("Failed to upload alert panel image.", "error", err)
+ }
+
+ return n.sendNotifications(context, notifiers)
+}
+
+func (n *RootNotifier) sendNotifications(context *EvalContext, notifiers []Notifier) error {
+ g, _ := errgroup.WithContext(context.Ctx)
+
+ for _, notifier := range notifiers {
+ not := notifier //avoid updating scope variable in go routine
+ n.log.Info("Sending notification", "type", not.GetType(), "id", not.GetNotifierId(), "isDefault", not.GetIsDefault())
+ g.Go(func() error { return not.Notify(context) })
+ }
+
+ return g.Wait()
+}
+
+func (n *RootNotifier) uploadImage(context *EvalContext) (err error) {
+ uploader, err := imguploader.NewImageUploader()
+ if err != nil {
+ return err
+ }
+
+ renderOpts := &renderer.RenderOpts{
+ Width: "800",
+ Height: "400",
+ Timeout: "30",
+ OrgId: context.Rule.OrgId,
+ }
+
+ if slug, err := context.GetDashboardSlug(); err != nil {
+ return err
+ } else {
+ renderOpts.Path = fmt.Sprintf("dashboard-solo/db/%s?&panelId=%d", slug, context.Rule.PanelId)
+ }
+
+ if imagePath, err := renderer.RenderToPng(renderOpts); err != nil {
+ return err
+ } else {
+ context.ImageOnDiskPath = imagePath
+ }
+
+ context.ImagePublicUrl, err = uploader.Upload(context.ImageOnDiskPath)
+ if err != nil {
+ return err
+ }
+
+ n.log.Info("uploaded", "url", context.ImagePublicUrl)
+ return nil
+}
+
+func (n *RootNotifier) getNotifiers(orgId int64, notificationIds []int64, context *EvalContext) ([]Notifier, error) {
+ query := &m.GetAlertNotificationsToSendQuery{OrgId: orgId, Ids: notificationIds}
+
+ if err := bus.Dispatch(query); err != nil {
+ return nil, err
+ }
+
+ var result []Notifier
+ for _, notification := range query.Result {
+ if not, err := n.createNotifierFor(notification); err != nil {
+ return nil, err
+ } else {
+ if shouldUseNotification(not, context) {
+ result = append(result, not)
+ }
+ }
+ }
+
+ return result, nil
+}
+
+func (n *RootNotifier) createNotifierFor(model *m.AlertNotification) (Notifier, error) {
+ notifierPlugin, found := notifierFactories[model.Type]
+ if !found {
+ return nil, errors.New("Unsupported notification type")
+ }
+
+ return notifierPlugin.Factory(model)
+}
+
+func shouldUseNotification(notifier Notifier, context *EvalContext) bool {
+ if !context.Firing {
+ return true
+ }
+
+ if context.Error != nil {
+ return true
+ }
+
+ return notifier.PassesFilter(context.Rule)
+}
+
+type NotifierFactory func(notification *m.AlertNotification) (Notifier, error)
+
+var notifierFactories map[string]*NotifierPlugin = make(map[string]*NotifierPlugin)
+
+func RegisterNotifier(plugin *NotifierPlugin) {
+ notifierFactories[plugin.Type] = plugin
+}
+
+func GetNotifiers() []*NotifierPlugin {
+ list := make([]*NotifierPlugin, 0)
+
+ for _, value := range notifierFactories {
+ list = append(list, value)
+ }
+
+ return list
+}
diff --git a/pkg/services/alerting/notifier_test.go b/pkg/services/alerting/notifier_test.go
new file mode 100644
index 00000000000..5e378dec890
--- /dev/null
+++ b/pkg/services/alerting/notifier_test.go
@@ -0,0 +1,89 @@
+package alerting
+
+import (
+ "testing"
+
+ "fmt"
+
+ "github.com/grafana/grafana/pkg/models"
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+type FakeNotifier struct {
+ FakeMatchResult bool
+}
+
+func (fn *FakeNotifier) GetType() string {
+ return "FakeNotifier"
+}
+
+func (fn *FakeNotifier) NeedsImage() bool {
+ return true
+}
+
+func (n *FakeNotifier) GetNotifierId() int64 {
+ return 0
+}
+
+func (n *FakeNotifier) GetIsDefault() bool {
+ return false
+}
+
+func (fn *FakeNotifier) Notify(alertResult *EvalContext) error { return nil }
+
+func (fn *FakeNotifier) PassesFilter(rule *Rule) bool {
+ return fn.FakeMatchResult
+}
+
+func TestAlertNotificationExtraction(t *testing.T) {
+
+ Convey("Notifier tests", t, func() {
+ Convey("none firing alerts", func() {
+ ctx := &EvalContext{
+ Firing: false,
+ Rule: &Rule{
+ State: m.AlertStateAlerting,
+ },
+ }
+ notifier := &FakeNotifier{FakeMatchResult: false}
+
+ So(shouldUseNotification(notifier, ctx), ShouldBeTrue)
+ })
+
+ Convey("execution error cannot be ignored", func() {
+ ctx := &EvalContext{
+ Firing: true,
+ Error: fmt.Errorf("I used to be a programmer just like you"),
+ Rule: &Rule{
+ State: m.AlertStateOK,
+ },
+ }
+ notifier := &FakeNotifier{FakeMatchResult: false}
+
+ So(shouldUseNotification(notifier, ctx), ShouldBeTrue)
+ })
+
+ Convey("firing alert that match", func() {
+ ctx := &EvalContext{
+ Firing: true,
+ Rule: &Rule{
+ State: models.AlertStateAlerting,
+ },
+ }
+ notifier := &FakeNotifier{FakeMatchResult: true}
+
+ So(shouldUseNotification(notifier, ctx), ShouldBeTrue)
+ })
+
+ Convey("firing alert that dont match", func() {
+ ctx := &EvalContext{
+ Firing: true,
+ Rule: &Rule{State: m.AlertStateOK},
+ }
+ notifier := &FakeNotifier{FakeMatchResult: false}
+
+ So(shouldUseNotification(notifier, ctx), ShouldBeFalse)
+ })
+ })
+}
diff --git a/pkg/services/alerting/notifiers/base.go b/pkg/services/alerting/notifiers/base.go
new file mode 100644
index 00000000000..f1e748207d8
--- /dev/null
+++ b/pkg/services/alerting/notifiers/base.go
@@ -0,0 +1,42 @@
+package notifiers
+
+import (
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/services/alerting"
+)
+
+type NotifierBase struct {
+ Name string
+ Type string
+ Id int64
+ IsDeault bool
+}
+
+func NewNotifierBase(id int64, isDefault bool, name, notifierType string, model *simplejson.Json) NotifierBase {
+ return NotifierBase{
+ Id: id,
+ Name: name,
+ IsDeault: isDefault,
+ Type: notifierType,
+ }
+}
+
+func (n *NotifierBase) PassesFilter(rule *alerting.Rule) bool {
+ return true
+}
+
+func (n *NotifierBase) GetType() string {
+ return n.Type
+}
+
+func (n *NotifierBase) NeedsImage() bool {
+ return true
+}
+
+func (n *NotifierBase) GetNotifierId() int64 {
+ return n.Id
+}
+
+func (n *NotifierBase) GetIsDefault() bool {
+ return n.IsDeault
+}
diff --git a/pkg/services/alerting/notifiers/email.go b/pkg/services/alerting/notifiers/email.go
new file mode 100644
index 00000000000..4058d3860b5
--- /dev/null
+++ b/pkg/services/alerting/notifiers/email.go
@@ -0,0 +1,111 @@
+package notifiers
+
+import (
+ "os"
+ "strings"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/metrics"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/alerting"
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+func init() {
+ alerting.RegisterNotifier(&alerting.NotifierPlugin{
+ Type: "email",
+ Name: "Email",
+ Description: "Sends notifications using Grafana server configured STMP settings",
+ Factory: NewEmailNotifier,
+ OptionsTemplate: `
+ Email addresses
+
+
+
+
+ You can enter multiple email addresses using a ";" separator
+
+ `,
+ })
+}
+
+type EmailNotifier struct {
+ NotifierBase
+ Addresses []string
+ log log.Logger
+}
+
+func NewEmailNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+ addressesString := model.Settings.Get("addresses").MustString()
+
+ if addressesString == "" {
+ return nil, alerting.ValidationError{Reason: "Could not find addresses in settings"}
+ }
+
+ // split addresses with a few different ways
+ addresses := strings.FieldsFunc(addressesString, func(r rune) bool {
+ switch r {
+ case ',', ';', '\n':
+ return true
+ }
+ return false
+ })
+
+ return &EmailNotifier{
+ NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings),
+ Addresses: addresses,
+ log: log.New("alerting.notifier.email"),
+ }, nil
+}
+
+func (this *EmailNotifier) Notify(evalContext *alerting.EvalContext) error {
+ this.log.Info("Sending alert notification to", "addresses", this.Addresses)
+ metrics.M_Alerting_Notification_Sent_Email.Inc(1)
+
+ ruleUrl, err := evalContext.GetRuleUrl()
+ if err != nil {
+ this.log.Error("Failed get rule link", "error", err)
+ return err
+ }
+
+ cmd := &m.SendEmailCommandSync{
+ SendEmailCommand: m.SendEmailCommand{
+ Subject: evalContext.GetNotificationTitle(),
+ Data: map[string]interface{}{
+ "Title": evalContext.GetNotificationTitle(),
+ "State": evalContext.Rule.State,
+ "Name": evalContext.Rule.Name,
+ "StateModel": evalContext.GetStateModel(),
+ "Message": evalContext.Rule.Message,
+ "RuleUrl": ruleUrl,
+ "ImageLink": "",
+ "EmbededImage": "",
+ "AlertPageUrl": setting.AppUrl + "alerting",
+ "EvalMatches": evalContext.EvalMatches,
+ },
+ To: this.Addresses,
+ Template: "alert_notification.html",
+ EmbededFiles: []string{},
+ },
+ }
+
+ if evalContext.ImagePublicUrl != "" {
+ cmd.Data["ImageLink"] = evalContext.ImagePublicUrl
+ } else {
+ file, err := os.Stat(evalContext.ImageOnDiskPath)
+ if err == nil {
+ cmd.EmbededFiles = []string{evalContext.ImageOnDiskPath}
+ cmd.Data["EmbededImage"] = file.Name()
+ }
+ }
+
+ err = bus.DispatchCtx(evalContext.Ctx, cmd)
+
+ if err != nil {
+ this.log.Error("Failed to send alert notification email", "error", err)
+ return err
+ }
+ return nil
+
+}
diff --git a/pkg/services/alerting/notifiers/email_test.go b/pkg/services/alerting/notifiers/email_test.go
new file mode 100644
index 00000000000..9750cbc2833
--- /dev/null
+++ b/pkg/services/alerting/notifiers/email_test.go
@@ -0,0 +1,79 @@
+package notifiers
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestEmailNotifier(t *testing.T) {
+ Convey("Email notifier tests", t, func() {
+
+ Convey("Parsing alert notification from settings", func() {
+ Convey("empty settings should return error", func() {
+ json := `{ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "ops",
+ Type: "email",
+ Settings: settingsJSON,
+ }
+
+ _, err := NewEmailNotifier(model)
+ So(err, ShouldNotBeNil)
+ })
+
+ Convey("from settings", func() {
+ json := `
+ {
+ "addresses": "ops@grafana.org"
+ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "ops",
+ Type: "email",
+ Settings: settingsJSON,
+ }
+
+ not, err := NewEmailNotifier(model)
+ emailNotifier := not.(*EmailNotifier)
+
+ So(err, ShouldBeNil)
+ So(emailNotifier.Name, ShouldEqual, "ops")
+ So(emailNotifier.Type, ShouldEqual, "email")
+ So(emailNotifier.Addresses[0], ShouldEqual, "ops@grafana.org")
+ })
+
+ Convey("from settings with two emails", func() {
+ json := `
+ {
+ "addresses": "ops@grafana.org;dev@grafana.org"
+ }`
+
+ settingsJSON, err := simplejson.NewJson([]byte(json))
+ So(err, ShouldBeNil)
+
+ model := &m.AlertNotification{
+ Name: "ops",
+ Type: "email",
+ Settings: settingsJSON,
+ }
+
+ not, err := NewEmailNotifier(model)
+ emailNotifier := not.(*EmailNotifier)
+
+ So(err, ShouldBeNil)
+ So(emailNotifier.Name, ShouldEqual, "ops")
+ So(emailNotifier.Type, ShouldEqual, "email")
+ So(len(emailNotifier.Addresses), ShouldEqual, 2)
+
+ So(emailNotifier.Addresses[0], ShouldEqual, "ops@grafana.org")
+ So(emailNotifier.Addresses[1], ShouldEqual, "dev@grafana.org")
+ })
+ })
+ })
+}
diff --git a/pkg/services/alerting/notifiers/opsgenie.go b/pkg/services/alerting/notifiers/opsgenie.go
new file mode 100644
index 00000000000..742aeb922b6
--- /dev/null
+++ b/pkg/services/alerting/notifiers/opsgenie.go
@@ -0,0 +1,140 @@
+package notifiers
+
+import (
+ "fmt"
+ "strconv"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/metrics"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/alerting"
+)
+
+func init() {
+ alerting.RegisterNotifier(&alerting.NotifierPlugin{
+ Type: "opsgenie",
+ Name: "OpsGenie",
+ Description: "Sends notifications to OpsGenie",
+ Factory: NewOpsGenieNotifier,
+ OptionsTemplate: `
+ OpsGenie settings
+
+ API Key
+
+
+
+
+
+ `,
+ })
+}
+
+var (
+ opsgenieCreateAlertURL string = "https://api.opsgenie.com/v1/json/alert"
+ opsgenieCloseAlertURL string = "https://api.opsgenie.com/v1/json/alert/close"
+)
+
+func NewOpsGenieNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+ autoClose := model.Settings.Get("autoClose").MustBool(true)
+ apiKey := model.Settings.Get("apiKey").MustString()
+ if apiKey == "" {
+ return nil, alerting.ValidationError{Reason: "Could not find api key property in settings"}
+ }
+
+ return &OpsGenieNotifier{
+ NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings),
+ ApiKey: apiKey,
+ AutoClose: autoClose,
+ log: log.New("alerting.notifier.opsgenie"),
+ }, nil
+}
+
+type OpsGenieNotifier struct {
+ NotifierBase
+ ApiKey string
+ AutoClose bool
+ log log.Logger
+}
+
+func (this *OpsGenieNotifier) Notify(evalContext *alerting.EvalContext) error {
+ metrics.M_Alerting_Notification_Sent_OpsGenie.Inc(1)
+
+ var err error
+ switch evalContext.Rule.State {
+ case m.AlertStateOK:
+ if this.AutoClose {
+ err = this.closeAlert(evalContext)
+ }
+ case m.AlertStateAlerting:
+ err = this.createAlert(evalContext)
+ }
+ return err
+}
+
+func (this *OpsGenieNotifier) createAlert(evalContext *alerting.EvalContext) error {
+ this.log.Info("Creating OpsGenie alert", "ruleId", evalContext.Rule.Id, "notification", this.Name)
+
+ ruleUrl, err := evalContext.GetRuleUrl()
+ if err != nil {
+ this.log.Error("Failed get rule link", "error", err)
+ return err
+ }
+
+ bodyJSON := simplejson.New()
+ bodyJSON.Set("apiKey", this.ApiKey)
+ bodyJSON.Set("message", evalContext.Rule.Name)
+ bodyJSON.Set("source", "Grafana")
+ bodyJSON.Set("alias", "alertId-"+strconv.FormatInt(evalContext.Rule.Id, 10))
+ bodyJSON.Set("description", fmt.Sprintf("%s - %s\n%s", evalContext.Rule.Name, ruleUrl, evalContext.Rule.Message))
+
+ details := simplejson.New()
+ details.Set("url", ruleUrl)
+ if evalContext.ImagePublicUrl != "" {
+ details.Set("image", evalContext.ImagePublicUrl)
+ }
+
+ bodyJSON.Set("details", details)
+ body, _ := bodyJSON.MarshalJSON()
+
+ cmd := &m.SendWebhookSync{
+ Url: opsgenieCreateAlertURL,
+ Body: string(body),
+ HttpMethod: "POST",
+ }
+
+ if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
+ this.log.Error("Failed to send notification to OpsGenie", "error", err, "body", string(body))
+ }
+
+ return nil
+}
+
+func (this *OpsGenieNotifier) closeAlert(evalContext *alerting.EvalContext) error {
+ this.log.Info("Closing OpsGenie alert", "ruleId", evalContext.Rule.Id, "notification", this.Name)
+
+ bodyJSON := simplejson.New()
+ bodyJSON.Set("apiKey", this.ApiKey)
+ bodyJSON.Set("alias", "alertId-"+strconv.FormatInt(evalContext.Rule.Id, 10))
+ body, _ := bodyJSON.MarshalJSON()
+
+ cmd := &m.SendWebhookSync{
+ Url: opsgenieCloseAlertURL,
+ Body: string(body),
+ HttpMethod: "POST",
+ }
+
+ if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
+ this.log.Error("Failed to send notification to OpsGenie", "error", err, "body", string(body))
+ return err
+ }
+
+ return nil
+}
diff --git a/pkg/services/alerting/notifiers/opsgenie_test.go b/pkg/services/alerting/notifiers/opsgenie_test.go
new file mode 100644
index 00000000000..9dcb9f3c600
--- /dev/null
+++ b/pkg/services/alerting/notifiers/opsgenie_test.go
@@ -0,0 +1,52 @@
+package notifiers
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestOpsGenieNotifier(t *testing.T) {
+ Convey("OpsGenie notifier tests", t, func() {
+
+ Convey("Parsing alert notification from settings", func() {
+ Convey("empty settings should return error", func() {
+ json := `{ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "opsgenie_testing",
+ Type: "opsgenie",
+ Settings: settingsJSON,
+ }
+
+ _, err := NewOpsGenieNotifier(model)
+ So(err, ShouldNotBeNil)
+ })
+
+ Convey("settings should trigger incident", func() {
+ json := `
+ {
+ "apiKey": "abcdefgh0123456789"
+ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "opsgenie_testing",
+ Type: "opsgenie",
+ Settings: settingsJSON,
+ }
+
+ not, err := NewOpsGenieNotifier(model)
+ opsgenieNotifier := not.(*OpsGenieNotifier)
+
+ So(err, ShouldBeNil)
+ So(opsgenieNotifier.Name, ShouldEqual, "opsgenie_testing")
+ So(opsgenieNotifier.Type, ShouldEqual, "opsgenie")
+ So(opsgenieNotifier.ApiKey, ShouldEqual, "abcdefgh0123456789")
+ })
+ })
+ })
+}
diff --git a/pkg/services/alerting/notifiers/pagerduty.go b/pkg/services/alerting/notifiers/pagerduty.go
new file mode 100644
index 00000000000..0c98ab00e20
--- /dev/null
+++ b/pkg/services/alerting/notifiers/pagerduty.go
@@ -0,0 +1,117 @@
+package notifiers
+
+import (
+ "strconv"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/metrics"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/alerting"
+)
+
+func init() {
+ alerting.RegisterNotifier(&alerting.NotifierPlugin{
+ Type: "pagerduty",
+ Name: "PagerDuty",
+ Description: "Sends notifications to PagerDuty",
+ Factory: NewPagerdutyNotifier,
+ OptionsTemplate: `
+ PagerDuty settings
+
+ Integration Key
+
+
+
+
+
+ `,
+ })
+}
+
+var (
+ pagerdutyEventApiUrl string = "https://events.pagerduty.com/generic/2010-04-15/create_event.json"
+)
+
+func NewPagerdutyNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+ autoResolve := model.Settings.Get("autoResolve").MustBool(true)
+ key := model.Settings.Get("integrationKey").MustString()
+ if key == "" {
+ return nil, alerting.ValidationError{Reason: "Could not find integration key property in settings"}
+ }
+
+ return &PagerdutyNotifier{
+ NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings),
+ Key: key,
+ AutoResolve: autoResolve,
+ log: log.New("alerting.notifier.pagerduty"),
+ }, nil
+}
+
+type PagerdutyNotifier struct {
+ NotifierBase
+ Key string
+ AutoResolve bool
+ log log.Logger
+}
+
+func (this *PagerdutyNotifier) Notify(evalContext *alerting.EvalContext) error {
+ metrics.M_Alerting_Notification_Sent_PagerDuty.Inc(1)
+
+ if evalContext.Rule.State == m.AlertStateOK && !this.AutoResolve {
+ this.log.Info("Not sending a trigger to Pagerduty", "state", evalContext.Rule.State, "auto resolve", this.AutoResolve)
+ return nil
+ }
+
+ eventType := "trigger"
+ if evalContext.Rule.State == m.AlertStateOK {
+ eventType = "resolve"
+ }
+
+ this.log.Info("Notifying Pagerduty", "event_type", eventType)
+
+ bodyJSON := simplejson.New()
+ bodyJSON.Set("service_key", this.Key)
+ bodyJSON.Set("description", evalContext.Rule.Name+" - "+evalContext.Rule.Message)
+ bodyJSON.Set("client", "Grafana")
+ bodyJSON.Set("event_type", eventType)
+ bodyJSON.Set("incident_key", "alertId-"+strconv.FormatInt(evalContext.Rule.Id, 10))
+
+ ruleUrl, err := evalContext.GetRuleUrl()
+ if err != nil {
+ this.log.Error("Failed get rule link", "error", err)
+ return err
+ }
+ bodyJSON.Set("client_url", ruleUrl)
+
+ if evalContext.ImagePublicUrl != "" {
+ contexts := make([]interface{}, 1)
+ imageJSON := simplejson.New()
+ imageJSON.Set("type", "image")
+ imageJSON.Set("src", evalContext.ImagePublicUrl)
+ contexts[0] = imageJSON
+ bodyJSON.Set("contexts", contexts)
+ }
+
+ body, _ := bodyJSON.MarshalJSON()
+
+ cmd := &m.SendWebhookSync{
+ Url: pagerdutyEventApiUrl,
+ Body: string(body),
+ HttpMethod: "POST",
+ }
+
+ if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
+ this.log.Error("Failed to send notification to Pagerduty", "error", err, "body", string(body))
+ return err
+ }
+
+ return nil
+}
diff --git a/pkg/services/alerting/notifiers/pagerduty_test.go b/pkg/services/alerting/notifiers/pagerduty_test.go
new file mode 100644
index 00000000000..522bb133d77
--- /dev/null
+++ b/pkg/services/alerting/notifiers/pagerduty_test.go
@@ -0,0 +1,53 @@
+package notifiers
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestPagerdutyNotifier(t *testing.T) {
+ Convey("Pagerduty notifier tests", t, func() {
+
+ Convey("Parsing alert notification from settings", func() {
+ Convey("empty settings should return error", func() {
+ json := `{ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "pageduty_testing",
+ Type: "pagerduty",
+ Settings: settingsJSON,
+ }
+
+ _, err := NewPagerdutyNotifier(model)
+ So(err, ShouldNotBeNil)
+ })
+
+ Convey("settings should trigger incident", func() {
+ json := `
+ {
+ "integrationKey": "abcdefgh0123456789"
+ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "pagerduty_testing",
+ Type: "pagerduty",
+ Settings: settingsJSON,
+ }
+
+ not, err := NewPagerdutyNotifier(model)
+ pagerdutyNotifier := not.(*PagerdutyNotifier)
+
+ So(err, ShouldBeNil)
+ So(pagerdutyNotifier.Name, ShouldEqual, "pagerduty_testing")
+ So(pagerdutyNotifier.Type, ShouldEqual, "pagerduty")
+ So(pagerdutyNotifier.Key, ShouldEqual, "abcdefgh0123456789")
+ })
+
+ })
+ })
+}
diff --git a/pkg/services/alerting/notifiers/slack.go b/pkg/services/alerting/notifiers/slack.go
new file mode 100644
index 00000000000..7b2bfd09c9a
--- /dev/null
+++ b/pkg/services/alerting/notifiers/slack.go
@@ -0,0 +1,147 @@
+package notifiers
+
+import (
+ "encoding/json"
+ "time"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/metrics"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/alerting"
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+func init() {
+ alerting.RegisterNotifier(&alerting.NotifierPlugin{
+ Type: "slack",
+ Name: "Slack",
+ Description: "Sends notifications using Grafana server configured STMP settings",
+ Factory: NewSlackNotifier,
+ OptionsTemplate: `
+ Slack settings
+
+ Url
+
+
+ Recipient
+
+ Override default channel or user, use #channel-name or @username
+
+
+
+ Mention
+
+ Mention a user or a group using @ when notifying in a channel
+
+
+ `,
+ })
+
+}
+
+func NewSlackNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+ url := model.Settings.Get("url").MustString()
+ if url == "" {
+ return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
+ }
+
+ recipient := model.Settings.Get("recipient").MustString()
+ mention := model.Settings.Get("mention").MustString()
+
+ return &SlackNotifier{
+ NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings),
+ Url: url,
+ Recipient: recipient,
+ Mention: mention,
+ log: log.New("alerting.notifier.slack"),
+ }, nil
+}
+
+type SlackNotifier struct {
+ NotifierBase
+ Url string
+ Recipient string
+ Mention string
+ log log.Logger
+}
+
+func (this *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
+ this.log.Info("Executing slack notification", "ruleId", evalContext.Rule.Id, "notification", this.Name)
+ metrics.M_Alerting_Notification_Sent_Slack.Inc(1)
+
+ ruleUrl, err := evalContext.GetRuleUrl()
+ if err != nil {
+ this.log.Error("Failed get rule link", "error", err)
+ return err
+ }
+
+ fields := make([]map[string]interface{}, 0)
+ fieldLimitCount := 4
+ for index, evt := range evalContext.EvalMatches {
+ fields = append(fields, map[string]interface{}{
+ "title": evt.Metric,
+ "value": evt.Value,
+ "short": true,
+ })
+ if index > fieldLimitCount {
+ break
+ }
+ }
+
+ if evalContext.Error != nil {
+ fields = append(fields, map[string]interface{}{
+ "title": "Error message",
+ "value": evalContext.Error.Error(),
+ "short": false,
+ })
+ }
+
+ message := this.Mention
+ if evalContext.Rule.State != m.AlertStateOK { //dont add message when going back to alert state ok.
+ message += " " + evalContext.Rule.Message
+ }
+
+ body := map[string]interface{}{
+ "attachments": []map[string]interface{}{
+ {
+ "color": evalContext.GetStateModel().Color,
+ "title": evalContext.GetNotificationTitle(),
+ "title_link": ruleUrl,
+ "text": message,
+ "fields": fields,
+ "image_url": evalContext.ImagePublicUrl,
+ "footer": "Grafana v" + setting.BuildVersion,
+ "footer_icon": "http://grafana.org/assets/img/fav32.png",
+ "ts": time.Now().Unix(),
+ },
+ },
+ "parse": "full", // to linkify urls, users and channels in alert message.
+ }
+
+ //recipient override
+ if this.Recipient != "" {
+ body["channel"] = this.Recipient
+ }
+
+ data, _ := json.Marshal(&body)
+ cmd := &m.SendWebhookSync{Url: this.Url, Body: string(data)}
+
+ if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
+ this.log.Error("Failed to send slack notification", "error", err, "webhook", this.Name)
+ return err
+ }
+
+ return nil
+}
diff --git a/pkg/services/alerting/notifiers/slack_test.go b/pkg/services/alerting/notifiers/slack_test.go
new file mode 100644
index 00000000000..5b1763064aa
--- /dev/null
+++ b/pkg/services/alerting/notifiers/slack_test.go
@@ -0,0 +1,81 @@
+package notifiers
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestSlackNotifier(t *testing.T) {
+ Convey("Slack notifier tests", t, func() {
+
+ Convey("Parsing alert notification from settings", func() {
+ Convey("empty settings should return error", func() {
+ json := `{ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "ops",
+ Type: "slack",
+ Settings: settingsJSON,
+ }
+
+ _, err := NewSlackNotifier(model)
+ So(err, ShouldNotBeNil)
+ })
+
+ Convey("from settings", func() {
+ json := `
+ {
+ "url": "http://google.com"
+ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "ops",
+ Type: "slack",
+ Settings: settingsJSON,
+ }
+
+ not, err := NewSlackNotifier(model)
+ slackNotifier := not.(*SlackNotifier)
+
+ So(err, ShouldBeNil)
+ So(slackNotifier.Name, ShouldEqual, "ops")
+ So(slackNotifier.Type, ShouldEqual, "slack")
+ So(slackNotifier.Url, ShouldEqual, "http://google.com")
+ So(slackNotifier.Recipient, ShouldEqual, "")
+ So(slackNotifier.Mention, ShouldEqual, "")
+ })
+
+ Convey("from settings with Recipient and Mention", func() {
+ json := `
+ {
+ "url": "http://google.com",
+ "recipient": "#ds-opentsdb",
+ "mention": "@carl"
+ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "ops",
+ Type: "slack",
+ Settings: settingsJSON,
+ }
+
+ not, err := NewSlackNotifier(model)
+ slackNotifier := not.(*SlackNotifier)
+
+ So(err, ShouldBeNil)
+ So(slackNotifier.Name, ShouldEqual, "ops")
+ So(slackNotifier.Type, ShouldEqual, "slack")
+ So(slackNotifier.Url, ShouldEqual, "http://google.com")
+ So(slackNotifier.Recipient, ShouldEqual, "#ds-opentsdb")
+ So(slackNotifier.Mention, ShouldEqual, "@carl")
+ })
+
+ })
+ })
+}
diff --git a/pkg/services/alerting/notifiers/telegram.go b/pkg/services/alerting/notifiers/telegram.go
new file mode 100644
index 00000000000..dd3011a49ec
--- /dev/null
+++ b/pkg/services/alerting/notifiers/telegram.go
@@ -0,0 +1,113 @@
+package notifiers
+
+import (
+ "fmt"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/metrics"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/alerting"
+)
+
+var (
+ telegeramApiUrl string = "https://api.telegram.org/bot%s/%s"
+)
+
+func init() {
+ alerting.RegisterNotifier(&alerting.NotifierPlugin{
+ Type: "telegram",
+ Name: "Telegram",
+ Description: "Sends notifications to Telegram",
+ Factory: NewOpsGenieNotifier,
+ OptionsTemplate: `
+ Telegram API settings
+
+ BOT API Token
+
+
+ Chat ID
+
+ Integer Telegram Chat Identifier
+
+
+ `,
+ })
+
+}
+
+type TelegramNotifier struct {
+ NotifierBase
+ BotToken string
+ ChatID string
+ log log.Logger
+}
+
+func NewTelegramNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+ if model.Settings == nil {
+ return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
+ }
+
+ botToken := model.Settings.Get("bottoken").MustString()
+ chatId := model.Settings.Get("chatid").MustString()
+
+ if botToken == "" {
+ return nil, alerting.ValidationError{Reason: "Could not find Bot Token in settings"}
+ }
+
+ if chatId == "" {
+ return nil, alerting.ValidationError{Reason: "Could not find Chat Id in settings"}
+ }
+
+ return &TelegramNotifier{
+ NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings),
+ BotToken: botToken,
+ ChatID: chatId,
+ log: log.New("alerting.notifier.telegram"),
+ }, nil
+}
+
+func (this *TelegramNotifier) Notify(evalContext *alerting.EvalContext) error {
+ this.log.Info("Sending alert notification to", "bot_token", this.BotToken)
+ this.log.Info("Sending alert notification to", "chat_id", this.ChatID)
+ metrics.M_Alerting_Notification_Sent_Telegram.Inc(1)
+
+ bodyJSON := simplejson.New()
+
+ bodyJSON.Set("chat_id", this.ChatID)
+ bodyJSON.Set("parse_mode", "html")
+
+ message := fmt.Sprintf("%s\nState: %s\nMessage: %s\n", evalContext.GetNotificationTitle(), evalContext.Rule.Name, evalContext.Rule.Message)
+
+ ruleUrl, err := evalContext.GetRuleUrl()
+ if err == nil {
+ message = message + fmt.Sprintf("URL: %s\n", ruleUrl)
+ }
+ bodyJSON.Set("text", message)
+
+ url := fmt.Sprintf(telegeramApiUrl, this.BotToken, "sendMessage")
+ body, _ := bodyJSON.MarshalJSON()
+
+ cmd := &m.SendWebhookSync{
+ Url: url,
+ Body: string(body),
+ HttpMethod: "POST",
+ }
+
+ if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
+ this.log.Error("Failed to send webhook", "error", err, "webhook", this.Name)
+ return err
+ }
+
+ return nil
+}
diff --git a/pkg/services/alerting/notifiers/telegram_test.go b/pkg/services/alerting/notifiers/telegram_test.go
new file mode 100644
index 00000000000..3e8066e273b
--- /dev/null
+++ b/pkg/services/alerting/notifiers/telegram_test.go
@@ -0,0 +1,55 @@
+package notifiers
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestTelegramNotifier(t *testing.T) {
+ Convey("Telegram notifier tests", t, func() {
+
+ Convey("Parsing alert notification from settings", func() {
+ Convey("empty settings should return error", func() {
+ json := `{ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "telegram_testing",
+ Type: "telegram",
+ Settings: settingsJSON,
+ }
+
+ _, err := NewTelegramNotifier(model)
+ So(err, ShouldNotBeNil)
+ })
+
+ Convey("settings should trigger incident", func() {
+ json := `
+ {
+ "bottoken": "abcdefgh0123456789",
+ "chatid": "-1234567890"
+ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "telegram_testing",
+ Type: "telegram",
+ Settings: settingsJSON,
+ }
+
+ not, err := NewTelegramNotifier(model)
+ telegramNotifier := not.(*TelegramNotifier)
+
+ So(err, ShouldBeNil)
+ So(telegramNotifier.Name, ShouldEqual, "telegram_testing")
+ So(telegramNotifier.Type, ShouldEqual, "telegram")
+ So(telegramNotifier.BotToken, ShouldEqual, "abcdefgh0123456789")
+ So(telegramNotifier.ChatID, ShouldEqual, "-1234567890")
+ })
+
+ })
+ })
+}
diff --git a/pkg/services/alerting/notifiers/victorops.go b/pkg/services/alerting/notifiers/victorops.go
new file mode 100644
index 00000000000..a4e34a40b8a
--- /dev/null
+++ b/pkg/services/alerting/notifiers/victorops.go
@@ -0,0 +1,113 @@
+package notifiers
+
+import (
+ "encoding/json"
+ "time"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/metrics"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/alerting"
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+// AlertStateCritical - Victorops uses "CRITICAL" string to indicate "Alerting" state
+const AlertStateCritical = "CRITICAL"
+
+func init() {
+ alerting.RegisterNotifier(&alerting.NotifierPlugin{
+ Type: "victorops",
+ Name: "VictorOps",
+ Description: "Sends notifications to VictorOps",
+ Factory: NewVictoropsNotifier,
+ OptionsTemplate: `
+ VictorOps settings
+
+ Url
+
+ `,
+ })
+}
+
+// NewVictoropsNotifier creates an instance of VictoropsNotifier that
+// handles posting notifications to Victorops REST API
+func NewVictoropsNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
+ url := model.Settings.Get("url").MustString()
+ if url == "" {
+ return nil, alerting.ValidationError{Reason: "Could not find victorops url property in settings"}
+ }
+
+ return &VictoropsNotifier{
+ NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings),
+ URL: url,
+ log: log.New("alerting.notifier.victorops"),
+ }, nil
+}
+
+// VictoropsNotifier defines URL property for Victorops REST API
+// and handles notification process by formatting POST body according to
+// Victorops specifications (http://victorops.force.com/knowledgebase/articles/Integration/Alert-Ingestion-API-Documentation/)
+type VictoropsNotifier struct {
+ NotifierBase
+ URL string
+ log log.Logger
+}
+
+// Notify sends notification to Victorops via POST to URL endpoint
+func (this *VictoropsNotifier) Notify(evalContext *alerting.EvalContext) error {
+ this.log.Info("Executing victorops notification", "ruleId", evalContext.Rule.Id, "notification", this.Name)
+ metrics.M_Alerting_Notification_Sent_Victorops.Inc(1)
+
+ ruleUrl, err := evalContext.GetRuleUrl()
+ if err != nil {
+ this.log.Error("Failed get rule link", "error", err)
+ return err
+ }
+
+ fields := make([]map[string]interface{}, 0)
+ fieldLimitCount := 4
+ for index, evt := range evalContext.EvalMatches {
+ fields = append(fields, map[string]interface{}{
+ "title": evt.Metric,
+ "value": evt.Value,
+ "short": true,
+ })
+ if index > fieldLimitCount {
+ break
+ }
+ }
+
+ if evalContext.Error != nil {
+ fields = append(fields, map[string]interface{}{
+ "title": "Error message",
+ "value": evalContext.Error.Error(),
+ "short": false,
+ })
+ }
+
+ messageType := evalContext.Rule.State
+ if evalContext.Rule.State == models.AlertStateAlerting { // translate 'Alerting' to 'CRITICAL' (Victorops analog)
+ messageType = AlertStateCritical
+ }
+
+ body := map[string]interface{}{
+ "message_type": messageType,
+ "entity_id": evalContext.Rule.Name,
+ "timestamp": time.Now().Unix(),
+ "state_start_time": evalContext.StartTime.Unix(),
+ "state_message": evalContext.Rule.Message + "\n" + ruleUrl,
+ "monitoring_tool": "Grafana v" + setting.BuildVersion,
+ }
+
+ data, _ := json.Marshal(&body)
+ cmd := &models.SendWebhookSync{Url: this.URL, Body: string(data)}
+
+ if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
+ this.log.Error("Failed to send victorops notification", "error", err, "webhook", this.Name)
+ return err
+ }
+
+ return nil
+}
diff --git a/pkg/services/alerting/notifiers/victorops_test.go b/pkg/services/alerting/notifiers/victorops_test.go
new file mode 100644
index 00000000000..6ac806a82cc
--- /dev/null
+++ b/pkg/services/alerting/notifiers/victorops_test.go
@@ -0,0 +1,52 @@
+package notifiers
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestVictoropsNotifier(t *testing.T) {
+ Convey("Victorops notifier tests", t, func() {
+
+ Convey("Parsing alert notification from settings", func() {
+ Convey("empty settings should return error", func() {
+ json := `{ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "victorops_testing",
+ Type: "victorops",
+ Settings: settingsJSON,
+ }
+
+ _, err := NewVictoropsNotifier(model)
+ So(err, ShouldNotBeNil)
+ })
+
+ Convey("from settings", func() {
+ json := `
+ {
+ "url": "http://google.com"
+ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "victorops_testing",
+ Type: "victorops",
+ Settings: settingsJSON,
+ }
+
+ not, err := NewVictoropsNotifier(model)
+ victoropsNotifier := not.(*VictoropsNotifier)
+
+ So(err, ShouldBeNil)
+ So(victoropsNotifier.Name, ShouldEqual, "victorops_testing")
+ So(victoropsNotifier.Type, ShouldEqual, "victorops")
+ So(victoropsNotifier.URL, ShouldEqual, "http://google.com")
+ })
+ })
+ })
+}
diff --git a/pkg/services/alerting/notifiers/webhook.go b/pkg/services/alerting/notifiers/webhook.go
new file mode 100644
index 00000000000..25ed22a65f5
--- /dev/null
+++ b/pkg/services/alerting/notifiers/webhook.go
@@ -0,0 +1,109 @@
+package notifiers
+
+import (
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/metrics"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/alerting"
+)
+
+func init() {
+ alerting.RegisterNotifier(&alerting.NotifierPlugin{
+ Type: "webhook",
+ Name: "webhook",
+ Description: "Sends HTTP POST request to a URL",
+ Factory: NewWebHookNotifier,
+ OptionsTemplate: `
+ Webhook settings
+
+ Url
+
+
+
+ Username
+
+
+ Password
+
+ `,
+ })
+
+}
+
+func NewWebHookNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+ url := model.Settings.Get("url").MustString()
+ if url == "" {
+ return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
+ }
+
+ return &WebhookNotifier{
+ NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings),
+ Url: url,
+ User: model.Settings.Get("user").MustString(),
+ Password: model.Settings.Get("password").MustString(),
+ HttpMethod: model.Settings.Get("httpMethod").MustString("POST"),
+ log: log.New("alerting.notifier.webhook"),
+ }, nil
+}
+
+type WebhookNotifier struct {
+ NotifierBase
+ Url string
+ User string
+ Password string
+ HttpMethod string
+ log log.Logger
+}
+
+func (this *WebhookNotifier) Notify(evalContext *alerting.EvalContext) error {
+ this.log.Info("Sending webhook")
+ metrics.M_Alerting_Notification_Sent_Webhook.Inc(1)
+
+ bodyJSON := simplejson.New()
+ bodyJSON.Set("title", evalContext.GetNotificationTitle())
+ bodyJSON.Set("ruleId", evalContext.Rule.Id)
+ bodyJSON.Set("ruleName", evalContext.Rule.Name)
+ bodyJSON.Set("state", evalContext.Rule.State)
+ bodyJSON.Set("evalMatches", evalContext.EvalMatches)
+
+ ruleUrl, err := evalContext.GetRuleUrl()
+ if err == nil {
+ bodyJSON.Set("ruleUrl", ruleUrl)
+ }
+
+ if evalContext.ImagePublicUrl != "" {
+ bodyJSON.Set("imageUrl", evalContext.ImagePublicUrl)
+ }
+
+ if evalContext.Rule.Message != "" {
+ bodyJSON.Set("message", evalContext.Rule.Message)
+ }
+
+ body, _ := bodyJSON.MarshalJSON()
+
+ cmd := &m.SendWebhookSync{
+ Url: this.Url,
+ User: this.User,
+ Password: this.Password,
+ Body: string(body),
+ HttpMethod: this.HttpMethod,
+ }
+
+ if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
+ this.log.Error("Failed to send webhook", "error", err, "webhook", this.Name)
+ return err
+ }
+
+ return nil
+}
diff --git a/pkg/services/alerting/notifiers/webhook_test.go b/pkg/services/alerting/notifiers/webhook_test.go
new file mode 100644
index 00000000000..eb25130e4e1
--- /dev/null
+++ b/pkg/services/alerting/notifiers/webhook_test.go
@@ -0,0 +1,52 @@
+package notifiers
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestWebhookNotifier(t *testing.T) {
+ Convey("Webhook notifier tests", t, func() {
+
+ Convey("Parsing alert notification from settings", func() {
+ Convey("empty settings should return error", func() {
+ json := `{ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "ops",
+ Type: "email",
+ Settings: settingsJSON,
+ }
+
+ _, err := NewWebHookNotifier(model)
+ So(err, ShouldNotBeNil)
+ })
+
+ Convey("from settings", func() {
+ json := `
+ {
+ "url": "http://google.com"
+ }`
+
+ settingsJSON, _ := simplejson.NewJson([]byte(json))
+ model := &m.AlertNotification{
+ Name: "ops",
+ Type: "email",
+ Settings: settingsJSON,
+ }
+
+ not, err := NewWebHookNotifier(model)
+ webhookNotifier := not.(*WebhookNotifier)
+
+ So(err, ShouldBeNil)
+ So(webhookNotifier.Name, ShouldEqual, "ops")
+ So(webhookNotifier.Type, ShouldEqual, "email")
+ So(webhookNotifier.Url, ShouldEqual, "http://google.com")
+ })
+ })
+ })
+}
diff --git a/pkg/services/alerting/reader.go b/pkg/services/alerting/reader.go
new file mode 100644
index 00000000000..1ecef79c434
--- /dev/null
+++ b/pkg/services/alerting/reader.go
@@ -0,0 +1,69 @@
+package alerting
+
+import (
+ "sync"
+ "time"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/metrics"
+ m "github.com/grafana/grafana/pkg/models"
+)
+
+type RuleReader interface {
+ Fetch() []*Rule
+}
+
+type DefaultRuleReader struct {
+ sync.RWMutex
+ serverID string
+ serverPosition int
+ clusterSize int
+ log log.Logger
+}
+
+func NewRuleReader() *DefaultRuleReader {
+ ruleReader := &DefaultRuleReader{
+ log: log.New("alerting.ruleReader"),
+ }
+
+ go ruleReader.initReader()
+ return ruleReader
+}
+
+func (arr *DefaultRuleReader) initReader() {
+ heartbeat := time.NewTicker(time.Second * 10)
+
+ for {
+ select {
+ case <-heartbeat.C:
+ arr.heartbeat()
+ }
+ }
+}
+
+func (arr *DefaultRuleReader) Fetch() []*Rule {
+ cmd := &m.GetAllAlertsQuery{}
+
+ if err := bus.Dispatch(cmd); err != nil {
+ arr.log.Error("Could not load alerts", "error", err)
+ return []*Rule{}
+ }
+
+ res := make([]*Rule, 0)
+ for _, ruleDef := range cmd.Result {
+ if model, err := NewRuleFromDBAlert(ruleDef); err != nil {
+ arr.log.Error("Could not build alert model for rule", "ruleId", ruleDef.Id, "error", err)
+ } else {
+ res = append(res, model)
+ }
+ }
+
+ metrics.M_Alerting_Active_Alerts.Update(int64(len(res)))
+ return res
+}
+
+func (arr *DefaultRuleReader) heartbeat() {
+ arr.clusterSize = 1
+ arr.serverPosition = 1
+}
diff --git a/pkg/services/alerting/result_handler.go b/pkg/services/alerting/result_handler.go
new file mode 100644
index 00000000000..aab109088cb
--- /dev/null
+++ b/pkg/services/alerting/result_handler.go
@@ -0,0 +1,137 @@
+package alerting
+
+import (
+ "time"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/metrics"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/annotations"
+)
+
+type ResultHandler interface {
+ Handle(evalContext *EvalContext) error
+}
+
+type DefaultResultHandler struct {
+ notifier Notifier
+ log log.Logger
+}
+
+func NewResultHandler() *DefaultResultHandler {
+ return &DefaultResultHandler{
+ log: log.New("alerting.resultHandler"),
+ notifier: NewRootNotifier(),
+ }
+}
+
+func (handler *DefaultResultHandler) GetStateFromEvaluation(evalContext *EvalContext) m.AlertStateType {
+ if evalContext.Error != nil {
+ handler.log.Error("Alert Rule Result Error",
+ "ruleId", evalContext.Rule.Id,
+ "name", evalContext.Rule.Name,
+ "error", evalContext.Error,
+ "changing state to", evalContext.Rule.ExecutionErrorState.ToAlertState())
+
+ if evalContext.Rule.ExecutionErrorState == m.ExecutionErrorKeepState {
+ return evalContext.PrevAlertState
+ } else {
+ return evalContext.Rule.ExecutionErrorState.ToAlertState()
+ }
+ } else if evalContext.Firing {
+ return m.AlertStateAlerting
+ } else if evalContext.NoDataFound {
+ handler.log.Info("Alert Rule returned no data",
+ "ruleId", evalContext.Rule.Id,
+ "name", evalContext.Rule.Name,
+ "changing state to", evalContext.Rule.NoDataState.ToAlertState())
+
+ if evalContext.Rule.NoDataState == m.NoDataKeepState {
+ return evalContext.PrevAlertState
+ } else {
+ return evalContext.Rule.NoDataState.ToAlertState()
+ }
+ }
+
+ return m.AlertStateOK
+}
+
+func (handler *DefaultResultHandler) Handle(evalContext *EvalContext) error {
+ executionError := ""
+ annotationData := simplejson.New()
+
+ evalContext.Rule.State = handler.GetStateFromEvaluation(evalContext)
+
+ if evalContext.Error != nil {
+ executionError = evalContext.Error.Error()
+ annotationData.Set("errorMessage", executionError)
+ }
+
+ if evalContext.Firing {
+ annotationData = simplejson.NewFromAny(evalContext.EvalMatches)
+ }
+
+ countStateResult(evalContext.Rule.State)
+ if evalContext.ShouldUpdateAlertState() {
+ handler.log.Info("New state change", "alertId", evalContext.Rule.Id, "newState", evalContext.Rule.State, "prev state", evalContext.PrevAlertState)
+
+ cmd := &m.SetAlertStateCommand{
+ AlertId: evalContext.Rule.Id,
+ OrgId: evalContext.Rule.OrgId,
+ State: evalContext.Rule.State,
+ Error: executionError,
+ EvalData: annotationData,
+ }
+
+ if err := bus.Dispatch(cmd); err != nil {
+ if err == m.ErrCannotChangeStateOnPausedAlert {
+ handler.log.Error("Cannot change state on alert thats pause", "error", err)
+ return err
+ }
+ handler.log.Error("Failed to save state", "error", err)
+ }
+
+ // save annotation
+ item := annotations.Item{
+ OrgId: evalContext.Rule.OrgId,
+ DashboardId: evalContext.Rule.DashboardId,
+ PanelId: evalContext.Rule.PanelId,
+ Type: annotations.AlertType,
+ AlertId: evalContext.Rule.Id,
+ Title: evalContext.Rule.Name,
+ Text: evalContext.GetStateModel().Text,
+ NewState: string(evalContext.Rule.State),
+ PrevState: string(evalContext.PrevAlertState),
+ Epoch: time.Now().Unix(),
+ Data: annotationData,
+ }
+
+ annotationRepo := annotations.GetRepository()
+ if err := annotationRepo.Save(&item); err != nil {
+ handler.log.Error("Failed to save annotation for new alert state", "error", err)
+ }
+
+ if evalContext.ShouldSendNotification() {
+ handler.notifier.Notify(evalContext)
+ }
+ }
+
+ return nil
+}
+
+func countStateResult(state m.AlertStateType) {
+ switch state {
+ case m.AlertStatePending:
+ metrics.M_Alerting_Result_State_Pending.Inc(1)
+ case m.AlertStateAlerting:
+ metrics.M_Alerting_Result_State_Alerting.Inc(1)
+ case m.AlertStateOK:
+ metrics.M_Alerting_Result_State_Ok.Inc(1)
+ case m.AlertStatePaused:
+ metrics.M_Alerting_Result_State_Paused.Inc(1)
+ case m.AlertStateNoData:
+ metrics.M_Alerting_Result_State_NoData.Inc(1)
+ }
+}
diff --git a/pkg/services/alerting/result_handler_test.go b/pkg/services/alerting/result_handler_test.go
new file mode 100644
index 00000000000..321838d4f4c
--- /dev/null
+++ b/pkg/services/alerting/result_handler_test.go
@@ -0,0 +1,90 @@
+package alerting
+
+import (
+ "context"
+ "testing"
+
+ "fmt"
+
+ "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestAlertingResultHandler(t *testing.T) {
+ Convey("Result handler", t, func() {
+ ctx := NewEvalContext(context.TODO(), &Rule{Conditions: []Condition{&conditionStub{firing: true}}})
+ dummieError := fmt.Errorf("dummie")
+ handler := NewResultHandler()
+
+ Convey("Should update alert state", func() {
+
+ Convey("ok -> alerting", func() {
+ ctx.PrevAlertState = models.AlertStateOK
+ ctx.Firing = true
+
+ So(handler.GetStateFromEvaluation(ctx), ShouldEqual, models.AlertStateAlerting)
+ So(ctx.ShouldUpdateAlertState(), ShouldBeTrue)
+ })
+
+ Convey("ok -> error(alerting)", func() {
+ ctx.PrevAlertState = models.AlertStateOK
+ ctx.Error = dummieError
+ ctx.Rule.ExecutionErrorState = models.ExecutionErrorSetAlerting
+
+ ctx.Rule.State = handler.GetStateFromEvaluation(ctx)
+ So(ctx.Rule.State, ShouldEqual, models.AlertStateAlerting)
+ So(ctx.ShouldUpdateAlertState(), ShouldBeTrue)
+ })
+
+ Convey("ok -> error(keep_last)", func() {
+ ctx.PrevAlertState = models.AlertStateOK
+ ctx.Error = dummieError
+ ctx.Rule.ExecutionErrorState = models.ExecutionErrorKeepState
+
+ ctx.Rule.State = handler.GetStateFromEvaluation(ctx)
+ So(ctx.Rule.State, ShouldEqual, models.AlertStateOK)
+ So(ctx.ShouldUpdateAlertState(), ShouldBeFalse)
+ })
+
+ Convey("pending -> error(keep_last)", func() {
+ ctx.PrevAlertState = models.AlertStatePending
+ ctx.Error = dummieError
+ ctx.Rule.ExecutionErrorState = models.ExecutionErrorKeepState
+
+ ctx.Rule.State = handler.GetStateFromEvaluation(ctx)
+ So(ctx.Rule.State, ShouldEqual, models.AlertStatePending)
+ So(ctx.ShouldUpdateAlertState(), ShouldBeFalse)
+ })
+
+ Convey("ok -> no_data(alerting)", func() {
+ ctx.PrevAlertState = models.AlertStateOK
+ ctx.Rule.NoDataState = models.NoDataSetAlerting
+ ctx.NoDataFound = true
+
+ ctx.Rule.State = handler.GetStateFromEvaluation(ctx)
+ So(ctx.Rule.State, ShouldEqual, models.AlertStateAlerting)
+ So(ctx.ShouldUpdateAlertState(), ShouldBeTrue)
+ })
+
+ Convey("ok -> no_data(keep_last)", func() {
+ ctx.PrevAlertState = models.AlertStateOK
+ ctx.Rule.NoDataState = models.NoDataKeepState
+ ctx.NoDataFound = true
+
+ ctx.Rule.State = handler.GetStateFromEvaluation(ctx)
+ So(ctx.Rule.State, ShouldEqual, models.AlertStateOK)
+ So(ctx.ShouldUpdateAlertState(), ShouldBeFalse)
+ })
+
+ Convey("pending -> no_data(keep_last)", func() {
+ ctx.PrevAlertState = models.AlertStatePending
+ ctx.Rule.NoDataState = models.NoDataKeepState
+ ctx.NoDataFound = true
+
+ ctx.Rule.State = handler.GetStateFromEvaluation(ctx)
+ So(ctx.Rule.State, ShouldEqual, models.AlertStatePending)
+ So(ctx.ShouldUpdateAlertState(), ShouldBeFalse)
+ })
+ })
+ })
+}
diff --git a/pkg/services/alerting/rule.go b/pkg/services/alerting/rule.go
new file mode 100644
index 00000000000..bdf53798e34
--- /dev/null
+++ b/pkg/services/alerting/rule.go
@@ -0,0 +1,140 @@
+package alerting
+
+import (
+ "fmt"
+ "regexp"
+ "strconv"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+
+ m "github.com/grafana/grafana/pkg/models"
+)
+
+type Rule struct {
+ Id int64
+ OrgId int64
+ DashboardId int64
+ PanelId int64
+ Frequency int64
+ Name string
+ Message string
+ NoDataState m.NoDataOption
+ ExecutionErrorState m.ExecutionErrorOption
+ State m.AlertStateType
+ Conditions []Condition
+ Notifications []int64
+}
+
+type ValidationError struct {
+ Reason string
+ Err error
+ Alertid int64
+ DashboardId int64
+ PanelId int64
+}
+
+func (e ValidationError) Error() string {
+ extraInfo := ""
+ if e.Alertid != 0 {
+ extraInfo = fmt.Sprintf("%s AlertId: %v", extraInfo, e.Alertid)
+ }
+
+ if e.PanelId != 0 {
+ extraInfo = fmt.Sprintf("%s PanelId: %v ", extraInfo, e.PanelId)
+ }
+
+ if e.DashboardId != 0 {
+ extraInfo = fmt.Sprintf("%s DashboardId: %v", extraInfo, e.DashboardId)
+ }
+
+ if e.Err != nil {
+ return fmt.Sprintf("%s %s%s", e.Err.Error(), e.Reason, extraInfo)
+ }
+
+ return fmt.Sprintf("Failed to extract alert.Reason: %s %s", e.Reason, extraInfo)
+}
+
+var (
+ ValueFormatRegex = regexp.MustCompile("^\\d+")
+ UnitFormatRegex = regexp.MustCompile("\\w{1}$")
+)
+
+var unitMultiplier = map[string]int{
+ "s": 1,
+ "m": 60,
+ "h": 3600,
+}
+
+func getTimeDurationStringToSeconds(str string) (int64, error) {
+ multiplier := 1
+
+ matches := ValueFormatRegex.FindAllString(str, 1)
+
+ if len(matches) <= 0 {
+ return 0, fmt.Errorf("Frequency could not be parsed")
+ }
+
+ value, err := strconv.Atoi(matches[0])
+ if err != nil {
+ return 0, err
+ }
+
+ unit := UnitFormatRegex.FindAllString(str, 1)[0]
+
+ if val, ok := unitMultiplier[unit]; ok {
+ multiplier = val
+ }
+
+ return int64(value * multiplier), nil
+}
+
+func NewRuleFromDBAlert(ruleDef *m.Alert) (*Rule, error) {
+ model := &Rule{}
+ model.Id = ruleDef.Id
+ model.OrgId = ruleDef.OrgId
+ model.DashboardId = ruleDef.DashboardId
+ model.PanelId = ruleDef.PanelId
+ model.Name = ruleDef.Name
+ model.Message = ruleDef.Message
+ model.Frequency = ruleDef.Frequency
+ model.State = ruleDef.State
+ model.NoDataState = m.NoDataOption(ruleDef.Settings.Get("noDataState").MustString("no_data"))
+ model.ExecutionErrorState = m.ExecutionErrorOption(ruleDef.Settings.Get("executionErrorState").MustString("alerting"))
+
+ for _, v := range ruleDef.Settings.Get("notifications").MustArray() {
+ jsonModel := simplejson.NewFromAny(v)
+ if id, err := jsonModel.Get("id").Int64(); err != nil {
+ return nil, ValidationError{Reason: "Invalid notification schema", DashboardId: model.DashboardId, Alertid: model.Id, PanelId: model.PanelId}
+ } else {
+ model.Notifications = append(model.Notifications, id)
+ }
+ }
+
+ for index, condition := range ruleDef.Settings.Get("conditions").MustArray() {
+ conditionModel := simplejson.NewFromAny(condition)
+ conditionType := conditionModel.Get("type").MustString()
+ if factory, exist := conditionFactories[conditionType]; !exist {
+ return nil, ValidationError{Reason: "Unknown alert condition: " + conditionType, DashboardId: model.DashboardId, Alertid: model.Id, PanelId: model.PanelId}
+ } else {
+ if queryCondition, err := factory(conditionModel, index); err != nil {
+ return nil, ValidationError{Err: err, DashboardId: model.DashboardId, Alertid: model.Id, PanelId: model.PanelId}
+ } else {
+ model.Conditions = append(model.Conditions, queryCondition)
+ }
+ }
+ }
+
+ if len(model.Conditions) == 0 {
+ return nil, fmt.Errorf("Alert is missing conditions")
+ }
+
+ return model, nil
+}
+
+type ConditionFactory func(model *simplejson.Json, index int) (Condition, error)
+
+var conditionFactories map[string]ConditionFactory = make(map[string]ConditionFactory)
+
+func RegisterCondition(typeName string, factory ConditionFactory) {
+ conditionFactories[typeName] = factory
+}
diff --git a/pkg/services/alerting/rule_test.go b/pkg/services/alerting/rule_test.go
new file mode 100644
index 00000000000..2a9e95e5723
--- /dev/null
+++ b/pkg/services/alerting/rule_test.go
@@ -0,0 +1,93 @@
+package alerting
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+type FakeCondition struct{}
+
+func (f *FakeCondition) Eval(context *EvalContext) (*ConditionResult, error) {
+ return &ConditionResult{}, nil
+}
+
+func TestAlertRuleModel(t *testing.T) {
+ Convey("Testing alert rule", t, func() {
+
+ RegisterCondition("test", func(model *simplejson.Json, index int) (Condition, error) {
+ return &FakeCondition{}, nil
+ })
+
+ Convey("Can parse seconds", func() {
+ seconds, _ := getTimeDurationStringToSeconds("10s")
+ So(seconds, ShouldEqual, 10)
+ })
+
+ Convey("Can parse minutes", func() {
+ seconds, _ := getTimeDurationStringToSeconds("10m")
+ So(seconds, ShouldEqual, 600)
+ })
+
+ Convey("Can parse hours", func() {
+ seconds, _ := getTimeDurationStringToSeconds("1h")
+ So(seconds, ShouldEqual, 3600)
+ })
+
+ Convey("defaults to seconds", func() {
+ seconds, _ := getTimeDurationStringToSeconds("1o")
+ So(seconds, ShouldEqual, 1)
+ })
+
+ Convey("should return err for empty string", func() {
+ _, err := getTimeDurationStringToSeconds("")
+ So(err, ShouldNotBeNil)
+ })
+
+ Convey("can construct alert rule model", func() {
+ json := `
+ {
+ "name": "name2",
+ "description": "desc2",
+ "handler": 0,
+ "noDataMode": "critical",
+ "enabled": true,
+ "frequency": "60s",
+ "conditions": [
+ {
+ "type": "test",
+ "prop": 123
+ }
+ ],
+ "notifications": [
+ {"id": 1134},
+ {"id": 22}
+ ]
+ }
+ `
+
+ alertJSON, jsonErr := simplejson.NewJson([]byte(json))
+ So(jsonErr, ShouldBeNil)
+
+ alert := &m.Alert{
+ Id: 1,
+ OrgId: 1,
+ DashboardId: 1,
+ PanelId: 1,
+
+ Settings: alertJSON,
+ }
+
+ alertRule, err := NewRuleFromDBAlert(alert)
+ So(err, ShouldBeNil)
+
+ So(len(alertRule.Conditions), ShouldEqual, 1)
+
+ Convey("Can read notifications", func() {
+ So(len(alertRule.Notifications), ShouldEqual, 2)
+ })
+ })
+ })
+}
diff --git a/pkg/services/alerting/scheduler.go b/pkg/services/alerting/scheduler.go
new file mode 100644
index 00000000000..151f802ec15
--- /dev/null
+++ b/pkg/services/alerting/scheduler.go
@@ -0,0 +1,78 @@
+package alerting
+
+import (
+ "math"
+ "time"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/models"
+)
+
+type SchedulerImpl struct {
+ jobs map[int64]*Job
+ log log.Logger
+}
+
+func NewScheduler() Scheduler {
+ return &SchedulerImpl{
+ jobs: make(map[int64]*Job, 0),
+ log: log.New("alerting.scheduler"),
+ }
+}
+
+func (s *SchedulerImpl) Update(rules []*Rule) {
+ s.log.Debug("Scheduling update", "ruleCount", len(rules))
+
+ jobs := make(map[int64]*Job, 0)
+
+ for i, rule := range rules {
+ var job *Job
+ if s.jobs[rule.Id] != nil {
+ job = s.jobs[rule.Id]
+ } else {
+ job = &Job{
+ Running: false,
+ }
+ }
+
+ job.Rule = rule
+
+ offset := ((rule.Frequency * 1000) / int64(len(rules))) * int64(i)
+ job.Offset = int64(math.Floor(float64(offset) / 1000))
+ if job.Offset == 0 { //zero offset causes division with 0 panics.
+ job.Offset = 1
+ }
+ jobs[rule.Id] = job
+ }
+
+ s.jobs = jobs
+}
+
+func (s *SchedulerImpl) Tick(tickTime time.Time, execQueue chan *Job) {
+ now := tickTime.Unix()
+
+ for _, job := range s.jobs {
+ if job.Running || job.Rule.State == models.AlertStatePaused {
+ continue
+ }
+
+ if job.OffsetWait && now%job.Offset == 0 {
+ job.OffsetWait = false
+ s.enque(job, execQueue)
+ continue
+ }
+
+ if now%job.Rule.Frequency == 0 {
+ if job.Offset > 0 {
+ job.OffsetWait = true
+ } else {
+ s.enque(job, execQueue)
+ }
+ }
+ }
+}
+
+func (s *SchedulerImpl) enque(job *Job, execQueue chan *Job) {
+ s.log.Debug("Scheduler: Putting job on to exec queue", "name", job.Rule.Name, "id", job.Rule.Id)
+ execQueue <- job
+}
diff --git a/pkg/services/alerting/test_notification.go b/pkg/services/alerting/test_notification.go
new file mode 100644
index 00000000000..fd908d6f95d
--- /dev/null
+++ b/pkg/services/alerting/test_notification.go
@@ -0,0 +1,75 @@
+package alerting
+
+import (
+ "context"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/log"
+ m "github.com/grafana/grafana/pkg/models"
+)
+
+type NotificationTestCommand struct {
+ State m.AlertStateType
+ Name string
+ Type string
+ Settings *simplejson.Json
+}
+
+func init() {
+ bus.AddHandler("alerting", handleNotificationTestCommand)
+
+}
+
+func handleNotificationTestCommand(cmd *NotificationTestCommand) error {
+ notifier := NewRootNotifier()
+
+ model := &m.AlertNotification{
+ Name: cmd.Name,
+ Type: cmd.Type,
+ Settings: cmd.Settings,
+ }
+
+ notifiers, err := notifier.createNotifierFor(model)
+
+ if err != nil {
+ log.Error2("Failed to create notifier", "error", err.Error())
+ return err
+ }
+
+ return notifier.sendNotifications(createTestEvalContext(), []Notifier{notifiers})
+}
+
+func createTestEvalContext() *EvalContext {
+ testRule := &Rule{
+ DashboardId: 1,
+ PanelId: 1,
+ Name: "Test notification",
+ Message: "Someone is testing the alert notification within grafana.",
+ State: m.AlertStateAlerting,
+ }
+
+ ctx := NewEvalContext(context.TODO(), testRule)
+ ctx.ImagePublicUrl = "http://grafana.org/assets/img/blog/mixed_styles.png"
+ ctx.IsTestRun = true
+ ctx.Firing = true
+ ctx.Error = nil
+ ctx.EvalMatches = evalMatchesBasedOnState()
+
+ return ctx
+}
+
+func evalMatchesBasedOnState() []*EvalMatch {
+ matches := make([]*EvalMatch, 0)
+ matches = append(matches, &EvalMatch{
+ Metric: "High value",
+ Value: 100,
+ })
+
+ matches = append(matches, &EvalMatch{
+ Metric: "Higher Value",
+ Value: 200,
+ })
+
+ return matches
+}
diff --git a/pkg/services/alerting/test_rule.go b/pkg/services/alerting/test_rule.go
new file mode 100644
index 00000000000..82b1a6276a1
--- /dev/null
+++ b/pkg/services/alerting/test_rule.go
@@ -0,0 +1,58 @@
+package alerting
+
+import (
+ "context"
+ "fmt"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+)
+
+type AlertTestCommand struct {
+ Dashboard *simplejson.Json
+ PanelId int64
+ OrgId int64
+
+ Result *EvalContext
+}
+
+func init() {
+ bus.AddHandler("alerting", handleAlertTestCommand)
+}
+
+func handleAlertTestCommand(cmd *AlertTestCommand) error {
+
+ dash := m.NewDashboardFromJson(cmd.Dashboard)
+
+ extractor := NewDashAlertExtractor(dash, cmd.OrgId)
+ alerts, err := extractor.GetAlerts()
+ if err != nil {
+ return err
+ }
+
+ for _, alert := range alerts {
+ if alert.PanelId == cmd.PanelId {
+ rule, err := NewRuleFromDBAlert(alert)
+ if err != nil {
+ return err
+ }
+
+ cmd.Result = testAlertRule(rule)
+ return nil
+ }
+ }
+
+ return fmt.Errorf("Could not find alert with panel id %d", cmd.PanelId)
+}
+
+func testAlertRule(rule *Rule) *EvalContext {
+ handler := NewEvalHandler()
+
+ context := NewEvalContext(context.TODO(), rule)
+ context.IsTestRun = true
+
+ handler.Eval(context)
+
+ return context
+}
diff --git a/pkg/services/alerting/ticker.go b/pkg/services/alerting/ticker.go
new file mode 100644
index 00000000000..5ce19b1b232
--- /dev/null
+++ b/pkg/services/alerting/ticker.go
@@ -0,0 +1,60 @@
+package alerting
+
+import (
+ "time"
+
+ "github.com/benbjohnson/clock"
+)
+
+// ticker is a ticker to power the alerting scheduler. it's like a time.Ticker, except:
+// * it doesn't drop ticks for slow receivers, rather, it queues up. so that callers are in control to instrument what's going on.
+// * it automatically ticks every second, which is the right thing in our current design
+// * it ticks on second marks or very shortly after. this provides a predictable load pattern
+// (this shouldn't cause too much load contention issues because the next steps in the pipeline just process at their own pace)
+// * the timestamps are used to mark "last datapoint to query for" and as such, are a configurable amount of seconds in the past
+// * because we want to allow:
+// - a clean "resume where we left off" and "don't yield ticks we already did"
+// - adjusting offset over time to compensate for storage backing up or getting fast and providing lower latency
+// you specify a lastProcessed timestamp as well as an offset at creation, or runtime
+type Ticker struct {
+ C chan time.Time
+ clock clock.Clock
+ last time.Time
+ offset time.Duration
+ newOffset chan time.Duration
+}
+
+// NewTicker returns a ticker that ticks on second marks or very shortly after, and never drops ticks
+func NewTicker(last time.Time, initialOffset time.Duration, c clock.Clock) *Ticker {
+ t := &Ticker{
+ C: make(chan time.Time),
+ clock: c,
+ last: last,
+ offset: initialOffset,
+ newOffset: make(chan time.Duration),
+ }
+ go t.run()
+ return t
+}
+
+func (t *Ticker) updateOffset(offset time.Duration) {
+ t.newOffset <- offset
+}
+
+func (t *Ticker) run() {
+ for {
+ next := t.last.Add(time.Duration(1) * time.Second)
+ diff := t.clock.Now().Add(-t.offset).Sub(next)
+ if diff >= 0 {
+ t.C <- next
+ t.last = next
+ continue
+ }
+ // tick is too young. try again when ...
+ select {
+ case <-t.clock.After(-diff): // ...it'll definitely be old enough
+ case offset := <-t.newOffset: // ...it might be old enough
+ t.offset = offset
+ }
+ }
+}
diff --git a/pkg/services/alerting/ticker_test.go b/pkg/services/alerting/ticker_test.go
new file mode 100644
index 00000000000..d4a5b958cdb
--- /dev/null
+++ b/pkg/services/alerting/ticker_test.go
@@ -0,0 +1,121 @@
+package alerting
+
+import (
+ "testing"
+ "time"
+
+ "github.com/benbjohnson/clock"
+)
+
+func inspectTick(tick time.Time, last time.Time, offset time.Duration, t *testing.T) {
+ if !tick.Equal(last.Add(time.Duration(1) * time.Second)) {
+ t.Fatalf("expected a tick 1 second more than prev, %s. got: %s", last, tick)
+ }
+}
+
+// returns the new last tick seen
+func assertAdvanceUntil(ticker *Ticker, last, desiredLast time.Time, offset, wait time.Duration, t *testing.T) time.Time {
+ for {
+ select {
+ case tick := <-ticker.C:
+ inspectTick(tick, last, offset, t)
+ last = tick
+ case <-time.NewTimer(wait).C:
+ if last.Before(desiredLast) {
+ t.Fatalf("waited %s for ticker to advance to %s, but only went up to %s", wait, desiredLast, last)
+ }
+ if last.After(desiredLast) {
+ t.Fatalf("timer advanced too far. should only have gone up to %s, but it went up to %s", desiredLast, last)
+ }
+ return last
+ }
+ }
+}
+
+func assertNoAdvance(ticker *Ticker, desiredLast time.Time, wait time.Duration, t *testing.T) {
+ for {
+ select {
+ case tick := <-ticker.C:
+ t.Fatalf("timer should have stayed at %s, instead it advanced to %s", desiredLast, tick)
+ case <-time.NewTimer(wait).C:
+ return
+ }
+ }
+}
+
+func TestTickerRetro1Hour(t *testing.T) {
+ offset := time.Duration(10) * time.Second
+ last := time.Unix(0, 0)
+ mock := clock.NewMock()
+ mock.Add(time.Duration(1) * time.Hour)
+ desiredLast := mock.Now().Add(-offset)
+ ticker := NewTicker(last, offset, mock)
+
+ last = assertAdvanceUntil(ticker, last, desiredLast, offset, time.Duration(10)*time.Millisecond, t)
+ assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
+
+}
+
+func TestAdvanceWithUpdateOffset(t *testing.T) {
+ offset := time.Duration(10) * time.Second
+ last := time.Unix(0, 0)
+ mock := clock.NewMock()
+ mock.Add(time.Duration(1) * time.Hour)
+ desiredLast := mock.Now().Add(-offset)
+ ticker := NewTicker(last, offset, mock)
+
+ last = assertAdvanceUntil(ticker, last, desiredLast, offset, time.Duration(10)*time.Millisecond, t)
+ assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
+
+ // lowering offset should see a few more ticks
+ offset = time.Duration(5) * time.Second
+ ticker.updateOffset(offset)
+ desiredLast = mock.Now().Add(-offset)
+ last = assertAdvanceUntil(ticker, last, desiredLast, offset, time.Duration(9)*time.Millisecond, t)
+ assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
+
+ // advancing clock should see even more ticks
+ mock.Add(time.Duration(1) * time.Hour)
+ desiredLast = mock.Now().Add(-offset)
+ last = assertAdvanceUntil(ticker, last, desiredLast, offset, time.Duration(8)*time.Millisecond, t)
+ assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
+
+}
+
+func getCase(lastSeconds, offsetSeconds int) (time.Time, time.Duration) {
+ last := time.Unix(int64(lastSeconds), 0)
+ offset := time.Duration(offsetSeconds) * time.Second
+ return last, offset
+}
+
+func TestTickerNoAdvance(t *testing.T) {
+
+ // it's 00:01:00 now. what are some cases where we don't want the ticker to advance?
+ mock := clock.NewMock()
+ mock.Add(time.Duration(60) * time.Second)
+
+ type Case struct {
+ last int
+ offset int
+ }
+
+ // note that some cases add up to now, others go into the future
+ cases := []Case{
+ {50, 10},
+ {50, 30},
+ {59, 1},
+ {59, 10},
+ {59, 30},
+ {60, 1},
+ {60, 10},
+ {60, 30},
+ {90, 1},
+ {90, 10},
+ {90, 30},
+ }
+ for _, c := range cases {
+ last, offset := getCase(c.last, c.offset)
+ ticker := NewTicker(last, offset, mock)
+ assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
+ }
+}
diff --git a/pkg/services/annotations/annotations.go b/pkg/services/annotations/annotations.go
new file mode 100644
index 00000000000..3fc3bafe5c5
--- /dev/null
+++ b/pkg/services/annotations/annotations.go
@@ -0,0 +1,63 @@
+package annotations
+
+import "github.com/grafana/grafana/pkg/components/simplejson"
+
+type Repository interface {
+ Save(item *Item) error
+ Find(query *ItemQuery) ([]*Item, error)
+ Delete(params *DeleteParams) error
+}
+
+type ItemQuery struct {
+ OrgId int64 `json:"orgId"`
+ From int64 `json:"from"`
+ To int64 `json:"from"`
+ Type ItemType `json:"type"`
+ AlertId int64 `json:"alertId"`
+ DashboardId int64 `json:"dashboardId"`
+ PanelId int64 `json:"panelId"`
+ NewState []string `json:"newState"`
+
+ Limit int64 `json:"alertId"`
+}
+
+type DeleteParams struct {
+ AlertId int64 `json:"alertId"`
+ DashboardId int64 `json:"dashboardId"`
+ PanelId int64 `json:"panelId"`
+}
+
+var repositoryInstance Repository
+
+func GetRepository() Repository {
+ return repositoryInstance
+}
+
+func SetRepository(rep Repository) {
+ repositoryInstance = rep
+}
+
+type ItemType string
+
+const (
+ AlertType ItemType = "alert"
+)
+
+type Item struct {
+ Id int64 `json:"id"`
+ OrgId int64 `json:"orgId"`
+ DashboardId int64 `json:"dashboardId"`
+ PanelId int64 `json:"panelId"`
+ CategoryId int64 `json:"panelId"`
+ Type ItemType `json:"type"`
+ Title string `json:"title"`
+ Text string `json:"text"`
+ Metric string `json:"metric"`
+ AlertId int64 `json:"alertId"`
+ UserId int64 `json:"userId"`
+ PrevState string `json:"prevState"`
+ NewState string `json:"newState"`
+ Epoch int64 `json:"epoch"`
+
+ Data *simplejson.Json `json:"data"`
+}
diff --git a/pkg/services/cleanup/cleanup.go b/pkg/services/cleanup/cleanup.go
new file mode 100644
index 00000000000..ffaa75de9cc
--- /dev/null
+++ b/pkg/services/cleanup/cleanup.go
@@ -0,0 +1,85 @@
+package cleanup
+
+import (
+ "context"
+ "io/ioutil"
+ "os"
+ "path"
+ "time"
+
+ "golang.org/x/sync/errgroup"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/log"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+type CleanUpService struct {
+ log log.Logger
+}
+
+func NewCleanUpService() *CleanUpService {
+ return &CleanUpService{
+ log: log.New("cleanup"),
+ }
+}
+
+func (service *CleanUpService) Run(ctx context.Context) error {
+ service.log.Info("Initializing CleanUpService")
+
+ g, _ := errgroup.WithContext(ctx)
+ g.Go(func() error { return service.start(ctx) })
+
+ err := g.Wait()
+ service.log.Info("Stopped CleanUpService", "reason", err)
+ return err
+}
+
+func (service *CleanUpService) start(ctx context.Context) error {
+ service.cleanUpTmpFiles()
+
+ ticker := time.NewTicker(time.Hour * 1)
+ for {
+ select {
+ case <-ticker.C:
+ service.cleanUpTmpFiles()
+ service.deleteExpiredSnapshots()
+ case <-ctx.Done():
+ return ctx.Err()
+ }
+ }
+}
+
+func (service *CleanUpService) cleanUpTmpFiles() {
+ if _, err := os.Stat(setting.ImagesDir); os.IsNotExist(err) {
+ return
+ }
+
+ files, err := ioutil.ReadDir(setting.ImagesDir)
+ if err != nil {
+ service.log.Error("Problem reading image dir", "error", err)
+ return
+ }
+
+ var toDelete []os.FileInfo
+ for _, file := range files {
+ if file.ModTime().AddDate(0, 0, 1).Before(time.Now()) {
+ toDelete = append(toDelete, file)
+ }
+ }
+
+ for _, file := range toDelete {
+ fullPath := path.Join(setting.ImagesDir, file.Name())
+ err := os.Remove(fullPath)
+ if err != nil {
+ service.log.Error("Failed to delete temp file", "file", file.Name(), "error", err)
+ }
+ }
+
+ service.log.Debug("Found old rendered image to delete", "deleted", len(toDelete), "keept", len(files))
+}
+
+func (service *CleanUpService) deleteExpiredSnapshots() {
+ bus.Dispatch(&m.DeleteExpiredSnapshotsCommand{})
+}
diff --git a/pkg/services/notifications/email.go b/pkg/services/notifications/email.go
index f81f3e1007b..803f2096b56 100644
--- a/pkg/services/notifications/email.go
+++ b/pkg/services/notifications/email.go
@@ -6,19 +6,12 @@ import (
)
type Message struct {
- To []string
- From string
- Subject string
- Body string
- Massive bool
- Info string
-}
-
-// create mail content
-func (m *Message) Content() string {
- contentType := "text/html; charset=UTF-8"
- content := "From: " + m.From + "\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body
- return content
+ To []string
+ From string
+ Subject string
+ Body string
+ Info string
+ EmbededFiles []string
}
func setDefaultTemplateData(data map[string]interface{}, u *m.User) {
diff --git a/pkg/services/notifications/mailer.go b/pkg/services/notifications/mailer.go
index 309436cb7d9..97bf75fdcb9 100644
--- a/pkg/services/notifications/mailer.go
+++ b/pkg/services/notifications/mailer.go
@@ -5,16 +5,19 @@
package notifications
import (
+ "bytes"
"crypto/tls"
+ "errors"
"fmt"
+ "html/template"
"net"
- "net/mail"
- "net/smtp"
- "os"
+ "strconv"
"strings"
"github.com/grafana/grafana/pkg/log"
+ m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
+ "gopkg.in/gomail.v2"
)
var mailQueue chan *Message
@@ -28,7 +31,7 @@ func processMailQueue() {
for {
select {
case msg := <-mailQueue:
- num, err := buildAndSend(msg)
+ num, err := send(msg)
tos := strings.Join(msg.To, "; ")
info := ""
if err != nil {
@@ -47,10 +50,40 @@ var addToMailQueue = func(msg *Message) {
mailQueue <- msg
}
-func sendToSmtpServer(recipients []string, msgContent []byte) error {
- host, port, err := net.SplitHostPort(setting.Smtp.Host)
+func send(msg *Message) (int, error) {
+ dialer, err := createDialer()
if err != nil {
- return err
+ return 0, err
+ }
+
+ for _, address := range msg.To {
+ m := gomail.NewMessage()
+ m.SetHeader("From", msg.From)
+ m.SetHeader("To", address)
+ m.SetHeader("Subject", msg.Subject)
+ for _, file := range msg.EmbededFiles {
+ m.Embed(file)
+ }
+
+ m.SetBody("text/html", msg.Body)
+
+ if err := dialer.DialAndSend(m); err != nil {
+ return 0, err
+ }
+ }
+
+ return len(msg.To), nil
+}
+
+func createDialer() (*gomail.Dialer, error) {
+ host, port, err := net.SplitHostPort(setting.Smtp.Host)
+
+ if err != nil {
+ return nil, err
+ }
+ iPort, err := strconv.Atoi(port)
+ if err != nil {
+ return nil, err
}
tlsconfig := &tls.Config{
@@ -61,126 +94,64 @@ func sendToSmtpServer(recipients []string, msgContent []byte) error {
if setting.Smtp.CertFile != "" {
cert, err := tls.LoadX509KeyPair(setting.Smtp.CertFile, setting.Smtp.KeyFile)
if err != nil {
- return err
+ return nil, fmt.Errorf("Could not load cert or key file. error: %v", err)
}
tlsconfig.Certificates = []tls.Certificate{cert}
}
- conn, err := net.Dial("tcp", net.JoinHostPort(host, port))
- if err != nil {
- return err
- }
- defer conn.Close()
-
- isSecureConn := false
- // Start TLS directly if the port ends with 465 (SMTPS protocol)
- if strings.HasSuffix(port, "465") {
- conn = tls.Client(conn, tlsconfig)
- isSecureConn = true
- }
-
- client, err := smtp.NewClient(conn, host)
- if err != nil {
- return err
- }
-
- hostname, err := os.Hostname()
- if err != nil {
- return err
- }
-
- if err = client.Hello(hostname); err != nil {
- return err
- }
-
- // If not using SMTPS, alway use STARTTLS if available
- hasStartTLS, _ := client.Extension("STARTTLS")
- if !isSecureConn && hasStartTLS {
- if err = client.StartTLS(tlsconfig); err != nil {
- return err
- }
- }
-
- canAuth, options := client.Extension("AUTH")
-
- if canAuth && len(setting.Smtp.User) > 0 {
- var auth smtp.Auth
-
- if strings.Contains(options, "CRAM-MD5") {
- auth = smtp.CRAMMD5Auth(setting.Smtp.User, setting.Smtp.Password)
- } else if strings.Contains(options, "PLAIN") {
- auth = smtp.PlainAuth("", setting.Smtp.User, setting.Smtp.Password, host)
- }
-
- if auth != nil {
- if err = client.Auth(auth); err != nil {
- return err
- }
- }
- }
-
- if fromAddress, err := mail.ParseAddress(setting.Smtp.FromAddress); err != nil {
- return err
- } else {
- if err = client.Mail(fromAddress.Address); err != nil {
- return err
- }
- }
-
- for _, rec := range recipients {
- if err = client.Rcpt(rec); err != nil {
- return err
- }
- }
-
- w, err := client.Data()
- if err != nil {
- return err
- }
- if _, err = w.Write([]byte(msgContent)); err != nil {
- return err
- }
-
- if err = w.Close(); err != nil {
- return err
- }
-
- return client.Quit()
+ d := gomail.NewDialer(host, iPort, setting.Smtp.User, setting.Smtp.Password)
+ d.TLSConfig = tlsconfig
+ return d, nil
}
-func buildAndSend(msg *Message) (int, error) {
- log.Trace("Sending mails to: %s", strings.Join(msg.To, "; "))
-
- // get message body
- content := msg.Content()
-
- if len(msg.To) == 0 {
- return 0, fmt.Errorf("empty receive emails")
- } else if len(msg.Body) == 0 {
- return 0, fmt.Errorf("empty email body")
+func buildEmailMessage(cmd *m.SendEmailCommand) (*Message, error) {
+ if !setting.Smtp.Enabled {
+ return nil, errors.New("Grafana mailing/smtp options not configured, contact your Grafana admin")
}
- if msg.Massive {
- // send mail to multiple emails one by one
- num := 0
- for _, to := range msg.To {
- body := []byte("To: " + to + "\r\n" + content)
- err := sendToSmtpServer([]string{to}, body)
- if err != nil {
- return num, err
- }
- num++
- }
- return num, nil
- } else {
- body := []byte("To: " + strings.Join(msg.To, ";") + "\r\n" + content)
+ var buffer bytes.Buffer
+ var err error
- // send to multiple emails in one message
- err := sendToSmtpServer(msg.To, body)
+ data := cmd.Data
+ if data == nil {
+ data = make(map[string]interface{}, 10)
+ }
+
+ setDefaultTemplateData(data, nil)
+ err = mailTemplates.ExecuteTemplate(&buffer, cmd.Template, data)
+ if err != nil {
+ return nil, err
+ }
+
+ subject := cmd.Subject
+ if cmd.Subject == "" {
+ var subjectText interface{}
+ subjectData := data["Subject"].(map[string]interface{})
+ subjectText, hasSubject := subjectData["value"]
+
+ if !hasSubject {
+ return nil, errors.New(fmt.Sprintf("Missing subject in Template %s", cmd.Template))
+ }
+
+ subjectTmpl, err := template.New("subject").Parse(subjectText.(string))
if err != nil {
- return 0, err
- } else {
- return 1, nil
+ return nil, err
}
+
+ var subjectBuffer bytes.Buffer
+ err = subjectTmpl.ExecuteTemplate(&subjectBuffer, "subject", data)
+ if err != nil {
+ return nil, err
+ }
+
+ subject = subjectBuffer.String()
}
+
+ return &Message{
+ To: cmd.To,
+ From: setting.Smtp.FromAddress,
+ Subject: subject,
+ Body: buffer.String(),
+ EmbededFiles: cmd.EmbededFiles,
+ }, nil
}
diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go
index 63ce7219618..c1ed9ac9e74 100644
--- a/pkg/services/notifications/notifications.go
+++ b/pkg/services/notifications/notifications.go
@@ -1,7 +1,7 @@
package notifications
import (
- "bytes"
+ "context"
"errors"
"fmt"
"html/template"
@@ -23,11 +23,16 @@ var tmplWelcomeOnSignUp = "welcome_on_signup.html"
func Init() error {
initMailQueue()
+ initWebhookQueue()
bus.AddHandler("email", sendResetPasswordEmail)
bus.AddHandler("email", validateResetPasswordCode)
bus.AddHandler("email", sendEmailCommandHandler)
+ bus.AddCtxHandler("email", sendEmailCommandHandlerSync)
+
+ bus.AddCtxHandler("webhook", SendWebhookSync)
+
bus.AddEventListener(signUpStartedHandler)
bus.AddEventListener(signUpCompletedHandler)
@@ -53,56 +58,49 @@ func Init() error {
return nil
}
+func SendWebhookSync(ctx context.Context, cmd *m.SendWebhookSync) error {
+ return sendWebRequestSync(ctx, &Webhook{
+ Url: cmd.Url,
+ User: cmd.User,
+ Password: cmd.Password,
+ Body: cmd.Body,
+ HttpMethod: cmd.HttpMethod,
+ })
+}
+
func subjectTemplateFunc(obj map[string]interface{}, value string) string {
obj["value"] = value
return ""
}
-func sendEmailCommandHandler(cmd *m.SendEmailCommand) error {
- if !setting.Smtp.Enabled {
- return errors.New("Grafana mailing/smtp options not configured, contact your Grafana admin")
- }
-
- var buffer bytes.Buffer
- var err error
- var subjectText interface{}
-
- data := cmd.Data
- if data == nil {
- data = make(map[string]interface{}, 10)
- }
-
- setDefaultTemplateData(data, nil)
- err = mailTemplates.ExecuteTemplate(&buffer, cmd.Template, data)
- if err != nil {
- return err
- }
-
- subjectData := data["Subject"].(map[string]interface{})
- subjectText, hasSubject := subjectData["value"]
-
- if !hasSubject {
- return errors.New(fmt.Sprintf("Missing subject in Template %s", cmd.Template))
- }
-
- subjectTmpl, err := template.New("subject").Parse(subjectText.(string))
- if err != nil {
- return err
- }
-
- var subjectBuffer bytes.Buffer
- err = subjectTmpl.ExecuteTemplate(&subjectBuffer, "subject", data)
- if err != nil {
- return err
- }
-
- addToMailQueue(&Message{
- To: cmd.To,
- From: setting.Smtp.FromAddress,
- Subject: subjectBuffer.String(),
- Body: buffer.String(),
+func sendEmailCommandHandlerSync(ctx context.Context, cmd *m.SendEmailCommandSync) error {
+ message, err := buildEmailMessage(&m.SendEmailCommand{
+ Data: cmd.Data,
+ Info: cmd.Info,
+ Template: cmd.Template,
+ To: cmd.To,
+ EmbededFiles: cmd.EmbededFiles,
+ Subject: cmd.Subject,
})
+ if err != nil {
+ return err
+ }
+
+ _, err = send(message)
+
+ return err
+}
+
+func sendEmailCommandHandler(cmd *m.SendEmailCommand) error {
+ message, err := buildEmailMessage(cmd)
+
+ if err != nil {
+ return err
+ }
+
+ addToMailQueue(message)
+
return nil
}
diff --git a/pkg/services/notifications/notifications_test.go b/pkg/services/notifications/notifications_test.go
index 110e24cb810..79db664e893 100644
--- a/pkg/services/notifications/notifications_test.go
+++ b/pkg/services/notifications/notifications_test.go
@@ -3,16 +3,21 @@ package notifications
import (
"testing"
- "github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
. "github.com/smartystreets/goconvey/convey"
)
+type testTriggeredAlert struct {
+ ActualValue float64
+ Name string
+ State string
+}
+
func TestNotifications(t *testing.T) {
Convey("Given the notifications service", t, func() {
- bus.ClearBusHandlers()
+ //bus.ClearBusHandlers()
setting.StaticRootPath = "../../../public/"
setting.Smtp.Enabled = true
@@ -35,5 +40,4 @@ func TestNotifications(t *testing.T) {
So(sentMsg.Body, ShouldNotContainSubstring, "Subject")
})
})
-
}
diff --git a/pkg/services/notifications/send_email_integration_test.go b/pkg/services/notifications/send_email_integration_test.go
new file mode 100644
index 00000000000..1a4406dc13a
--- /dev/null
+++ b/pkg/services/notifications/send_email_integration_test.go
@@ -0,0 +1,62 @@
+package notifications
+
+import (
+ "io/ioutil"
+ "testing"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestEmailIntegrationTest(t *testing.T) {
+ SkipConvey("Given the notifications service", t, func() {
+ bus.ClearBusHandlers()
+
+ setting.StaticRootPath = "../../../public/"
+ setting.Smtp.Enabled = true
+ setting.Smtp.TemplatesPattern = "emails/*.html"
+ setting.Smtp.FromAddress = "from@address.com"
+ setting.BuildVersion = "4.0.0"
+
+ err := Init()
+ So(err, ShouldBeNil)
+
+ addToMailQueue = func(msg *Message) {
+ ioutil.WriteFile("../../../tmp/test_email.html", []byte(msg.Body), 0777)
+ }
+
+ Convey("When sending reset email password", func() {
+ cmd := &m.SendEmailCommand{
+
+ Data: map[string]interface{}{
+ "Title": "[CRITICAL] Imaginary timeserie alert",
+ "State": "Firing",
+ "Name": "Imaginary timeserie alert",
+ "Severity": "ok",
+ "SeverityColor": "#D63232",
+ "Message": "Alert message that will support markdown in some distant future.",
+ "RuleUrl": "http://localhost:3000/dashboard/db/graphite-dashboard",
+ "ImageLink": "http://localhost:3000/render/dashboard-solo/db/graphite-dashboard?panelId=1&from=1471008499616&to=1471012099617&width=1000&height=500",
+ "AlertPageUrl": "http://localhost:3000/alerting",
+ "EvalMatches": []map[string]string{
+ {
+ "Metric": "desktop",
+ "Value": "40",
+ },
+ {
+ "Metric": "mobile",
+ "Value": "20",
+ },
+ },
+ },
+ To: []string{"asdf@asdf.com "},
+ Template: "alert_notification.html",
+ }
+
+ err := sendEmailCommandHandler(cmd)
+ So(err, ShouldBeNil)
+ })
+ })
+}
diff --git a/pkg/services/notifications/webhook.go b/pkg/services/notifications/webhook.go
new file mode 100644
index 00000000000..ac46a43f294
--- /dev/null
+++ b/pkg/services/notifications/webhook.go
@@ -0,0 +1,87 @@
+package notifications
+
+import (
+ "bytes"
+ "context"
+ "fmt"
+ "io/ioutil"
+ "net/http"
+
+ "golang.org/x/net/context/ctxhttp"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/util"
+)
+
+type Webhook struct {
+ Url string
+ User string
+ Password string
+ Body string
+ HttpMethod string
+}
+
+var (
+ webhookQueue chan *Webhook
+ webhookLog log.Logger
+)
+
+func initWebhookQueue() {
+ webhookLog = log.New("notifications.webhook")
+ webhookQueue = make(chan *Webhook, 10)
+ go processWebhookQueue()
+}
+
+func processWebhookQueue() {
+ for {
+ select {
+ case webhook := <-webhookQueue:
+ err := sendWebRequestSync(context.TODO(), webhook)
+
+ if err != nil {
+ webhookLog.Error("Failed to send webrequest ", "error", err)
+ }
+ }
+ }
+}
+
+func sendWebRequestSync(ctx context.Context, webhook *Webhook) error {
+ webhookLog.Debug("Sending webhook", "url", webhook.Url, "http method", webhook.HttpMethod)
+
+ if webhook.HttpMethod == "" {
+ webhook.HttpMethod = http.MethodPost
+ }
+
+ request, err := http.NewRequest(webhook.HttpMethod, webhook.Url, bytes.NewReader([]byte(webhook.Body)))
+ if err != nil {
+ return err
+ }
+
+ request.Header.Add("Content-Type", "application/json")
+ request.Header.Add("User-Agent", "Grafana")
+ if webhook.User != "" && webhook.Password != "" {
+ request.Header.Add("Authorization", util.GetBasicAuthHeader(webhook.User, webhook.Password))
+ }
+
+ resp, err := ctxhttp.Do(ctx, http.DefaultClient, request)
+ if err != nil {
+ return err
+ }
+
+ if resp.StatusCode/100 == 2 {
+ return nil
+ }
+
+ defer resp.Body.Close()
+ body, err := ioutil.ReadAll(resp.Body)
+ if err != nil {
+ return err
+ }
+
+ webhookLog.Debug("Webhook failed", "statuscode", resp.Status, "body", string(body))
+ return fmt.Errorf("Webhook response status %v", resp.Status)
+}
+
+var addToWebhookQueue = func(msg *Webhook) {
+ webhookQueue <- msg
+}
diff --git a/pkg/services/sqlstore/alert.go b/pkg/services/sqlstore/alert.go
new file mode 100644
index 00000000000..8718b03e786
--- /dev/null
+++ b/pkg/services/sqlstore/alert.go
@@ -0,0 +1,315 @@
+package sqlstore
+
+import (
+ "bytes"
+ "fmt"
+ "strings"
+ "time"
+
+ "github.com/go-xorm/xorm"
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+)
+
+func init() {
+ bus.AddHandler("sql", SaveAlerts)
+ bus.AddHandler("sql", HandleAlertsQuery)
+ bus.AddHandler("sql", GetAlertById)
+ bus.AddHandler("sql", DeleteAlertById)
+ bus.AddHandler("sql", GetAllAlertQueryHandler)
+ bus.AddHandler("sql", SetAlertState)
+ bus.AddHandler("sql", GetAlertStatesForDashboard)
+ bus.AddHandler("sql", PauseAlert)
+ bus.AddHandler("sql", PauseAllAlerts)
+}
+
+func GetAlertById(query *m.GetAlertByIdQuery) error {
+ alert := m.Alert{}
+ has, err := x.Id(query.Id).Get(&alert)
+ if !has {
+ return fmt.Errorf("could not find alert")
+ }
+ if err != nil {
+ return err
+ }
+
+ query.Result = &alert
+ return nil
+}
+
+func GetAllAlertQueryHandler(query *m.GetAllAlertsQuery) error {
+ var alerts []*m.Alert
+ err := x.Sql("select * from alert").Find(&alerts)
+ if err != nil {
+ return err
+ }
+
+ query.Result = alerts
+ return nil
+}
+
+func deleteAlertByIdInternal(alertId int64, reason string, sess *xorm.Session) error {
+ sqlog.Debug("Deleting alert", "id", alertId, "reason", reason)
+
+ if _, err := sess.Exec("DELETE FROM alert WHERE id = ?", alertId); err != nil {
+ return err
+ }
+
+ if _, err := sess.Exec("DELETE FROM annotation WHERE alert_id = ?", alertId); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func DeleteAlertById(cmd *m.DeleteAlertCommand) error {
+ return inTransaction(func(sess *xorm.Session) error {
+ return deleteAlertByIdInternal(cmd.AlertId, "DeleteAlertCommand", sess)
+ })
+}
+
+func HandleAlertsQuery(query *m.GetAlertsQuery) error {
+ var sql bytes.Buffer
+ params := make([]interface{}, 0)
+
+ sql.WriteString(`SELECT *
+ from alert
+ `)
+
+ sql.WriteString(`WHERE org_id = ?`)
+ params = append(params, query.OrgId)
+
+ if query.DashboardId != 0 {
+ sql.WriteString(` AND dashboard_id = ?`)
+ params = append(params, query.DashboardId)
+ }
+
+ if query.PanelId != 0 {
+ sql.WriteString(` AND panel_id = ?`)
+ params = append(params, query.PanelId)
+ }
+
+ if len(query.State) > 0 && query.State[0] != "ALL" {
+ sql.WriteString(` AND (`)
+ for i, v := range query.State {
+ if i > 0 {
+ sql.WriteString(" OR ")
+ }
+ sql.WriteString("state = ? ")
+ params = append(params, v)
+ }
+ sql.WriteString(")")
+ }
+
+ if query.Limit != 0 {
+ sql.WriteString(" LIMIT ?")
+ params = append(params, query.Limit)
+ }
+
+ sql.WriteString(" ORDER BY name ASC")
+
+ alerts := make([]*m.Alert, 0)
+ if err := x.Sql(sql.String(), params...).Find(&alerts); err != nil {
+ return err
+ }
+
+ query.Result = alerts
+ return nil
+}
+
+func DeleteAlertDefinition(dashboardId int64, sess *xorm.Session) error {
+ alerts := make([]*m.Alert, 0)
+ sess.Where("dashboard_id = ?", dashboardId).Find(&alerts)
+
+ for _, alert := range alerts {
+ deleteAlertByIdInternal(alert.Id, "Dashboard deleted", sess)
+ }
+
+ return nil
+}
+
+func SaveAlerts(cmd *m.SaveAlertsCommand) error {
+ return inTransaction(func(sess *xorm.Session) error {
+ existingAlerts, err := GetAlertsByDashboardId2(cmd.DashboardId, sess)
+ if err != nil {
+ return err
+ }
+
+ if err := upsertAlerts(existingAlerts, cmd, sess); err != nil {
+ return err
+ }
+
+ if err := deleteMissingAlerts(existingAlerts, cmd, sess); err != nil {
+ return err
+ }
+
+ return nil
+ })
+}
+
+func upsertAlerts(existingAlerts []*m.Alert, cmd *m.SaveAlertsCommand, sess *xorm.Session) error {
+ for _, alert := range cmd.Alerts {
+ update := false
+ var alertToUpdate *m.Alert
+
+ for _, k := range existingAlerts {
+ if alert.PanelId == k.PanelId {
+ update = true
+ alert.Id = k.Id
+ alertToUpdate = k
+ break
+ }
+ }
+
+ if update {
+ if alertToUpdate.ContainsUpdates(alert) {
+ alert.Updated = time.Now()
+ alert.State = alertToUpdate.State
+ _, err := sess.Id(alert.Id).Update(alert)
+ if err != nil {
+ return err
+ }
+
+ sqlog.Debug("Alert updated", "name", alert.Name, "id", alert.Id)
+ }
+ } else {
+ alert.Updated = time.Now()
+ alert.Created = time.Now()
+ alert.State = m.AlertStatePending
+ alert.NewStateDate = time.Now()
+
+ _, err := sess.Insert(alert)
+ if err != nil {
+ return err
+ }
+
+ sqlog.Debug("Alert inserted", "name", alert.Name, "id", alert.Id)
+ }
+ }
+
+ return nil
+}
+
+func deleteMissingAlerts(alerts []*m.Alert, cmd *m.SaveAlertsCommand, sess *xorm.Session) error {
+ for _, missingAlert := range alerts {
+ missing := true
+
+ for _, k := range cmd.Alerts {
+ if missingAlert.PanelId == k.PanelId {
+ missing = false
+ break
+ }
+ }
+
+ if missing {
+ deleteAlertByIdInternal(missingAlert.Id, "Removed from dashboard", sess)
+ }
+ }
+
+ return nil
+}
+
+func GetAlertsByDashboardId2(dashboardId int64, sess *xorm.Session) ([]*m.Alert, error) {
+ alerts := make([]*m.Alert, 0)
+ err := sess.Where("dashboard_id = ?", dashboardId).Find(&alerts)
+
+ if err != nil {
+ return []*m.Alert{}, err
+ }
+
+ return alerts, nil
+}
+
+func SetAlertState(cmd *m.SetAlertStateCommand) error {
+ return inTransaction(func(sess *xorm.Session) error {
+ alert := m.Alert{}
+
+ if has, err := sess.Id(cmd.AlertId).Get(&alert); err != nil {
+ return err
+ } else if !has {
+ return fmt.Errorf("Could not find alert")
+ }
+
+ if alert.State == m.AlertStatePaused {
+ return m.ErrCannotChangeStateOnPausedAlert
+ }
+
+ alert.State = cmd.State
+ alert.StateChanges += 1
+ alert.NewStateDate = time.Now()
+ alert.EvalData = cmd.EvalData
+
+ if cmd.Error == "" {
+ alert.ExecutionError = " " //without this space, xorm skips updating this field
+ } else {
+ alert.ExecutionError = cmd.Error
+ }
+
+ sess.Id(alert.Id).Update(&alert)
+ return nil
+ })
+}
+
+func PauseAlert(cmd *m.PauseAlertCommand) error {
+ return inTransaction(func(sess *xorm.Session) error {
+ if len(cmd.AlertIds) == 0 {
+ return fmt.Errorf("command contains no alertids")
+ }
+
+ var buffer bytes.Buffer
+ params := make([]interface{}, 0)
+
+ buffer.WriteString(`UPDATE alert SET state = ?`)
+ if cmd.Paused {
+ params = append(params, string(m.AlertStatePaused))
+ } else {
+ params = append(params, string(m.AlertStatePending))
+ }
+
+ buffer.WriteString(` WHERE id IN (?` + strings.Repeat(",?", len(cmd.AlertIds)-1) + `)`)
+ for _, v := range cmd.AlertIds {
+ params = append(params, v)
+ }
+
+ res, err := sess.Exec(buffer.String(), params...)
+ if err != nil {
+ return err
+ }
+ cmd.ResultCount, _ = res.RowsAffected()
+ return nil
+ })
+}
+
+func PauseAllAlerts(cmd *m.PauseAllAlertCommand) error {
+ return inTransaction(func(sess *xorm.Session) error {
+ var newState string
+ if cmd.Paused {
+ newState = string(m.AlertStatePaused)
+ } else {
+ newState = string(m.AlertStatePending)
+ }
+
+ res, err := sess.Exec(`UPDATE alert SET state = ?`, newState)
+ if err != nil {
+ return err
+ }
+ cmd.ResultCount, _ = res.RowsAffected()
+ return nil
+ })
+}
+
+func GetAlertStatesForDashboard(query *m.GetAlertStatesForDashboardQuery) error {
+ var rawSql = `SELECT
+ id,
+ dashboard_id,
+ panel_id,
+ state,
+ new_state_date
+ FROM alert
+ WHERE org_id = ? AND dashboard_id = ?`
+
+ query.Result = make([]*m.AlertStateInfoDTO, 0)
+ err := x.Sql(rawSql, query.OrgId, query.DashboardId).Find(&query.Result)
+
+ return err
+}
diff --git a/pkg/services/sqlstore/alert_notification.go b/pkg/services/sqlstore/alert_notification.go
new file mode 100644
index 00000000000..5acb53c3c09
--- /dev/null
+++ b/pkg/services/sqlstore/alert_notification.go
@@ -0,0 +1,200 @@
+package sqlstore
+
+import (
+ "bytes"
+ "fmt"
+ "strings"
+ "time"
+
+ "github.com/go-xorm/xorm"
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+)
+
+func init() {
+ bus.AddHandler("sql", GetAlertNotifications)
+ bus.AddHandler("sql", CreateAlertNotificationCommand)
+ bus.AddHandler("sql", UpdateAlertNotification)
+ bus.AddHandler("sql", DeleteAlertNotification)
+ bus.AddHandler("sql", GetAlertNotificationsToSend)
+ bus.AddHandler("sql", GetAllAlertNotifications)
+}
+
+func DeleteAlertNotification(cmd *m.DeleteAlertNotificationCommand) error {
+ return inTransaction(func(sess *xorm.Session) error {
+ sql := "DELETE FROM alert_notification WHERE alert_notification.org_id = ? AND alert_notification.id = ?"
+ _, err := sess.Exec(sql, cmd.OrgId, cmd.Id)
+
+ if err != nil {
+ return err
+ }
+
+ return nil
+ })
+}
+
+func GetAlertNotifications(query *m.GetAlertNotificationsQuery) error {
+ return getAlertNotificationInternal(query, x.NewSession())
+}
+
+func GetAllAlertNotifications(query *m.GetAllAlertNotificationsQuery) error {
+ results := make([]*m.AlertNotification, 0)
+ if err := x.Where("org_id = ?", query.OrgId).Find(&results); err != nil {
+ return err
+ }
+
+ query.Result = results
+ return nil
+}
+
+func GetAlertNotificationsToSend(query *m.GetAlertNotificationsToSendQuery) error {
+ var sql bytes.Buffer
+ params := make([]interface{}, 0)
+
+ sql.WriteString(`SELECT
+ alert_notification.id,
+ alert_notification.org_id,
+ alert_notification.name,
+ alert_notification.type,
+ alert_notification.created,
+ alert_notification.updated,
+ alert_notification.settings,
+ alert_notification.is_default
+ FROM alert_notification
+ `)
+
+ sql.WriteString(` WHERE alert_notification.org_id = ?`)
+ params = append(params, query.OrgId)
+
+ sql.WriteString(` AND ((alert_notification.is_default = ?)`)
+ params = append(params, dialect.BooleanStr(true))
+ if len(query.Ids) > 0 {
+ sql.WriteString(` OR alert_notification.id IN (?` + strings.Repeat(",?", len(query.Ids)-1) + ")")
+ for _, v := range query.Ids {
+ params = append(params, v)
+ }
+ }
+ sql.WriteString(`)`)
+
+ results := make([]*m.AlertNotification, 0)
+ if err := x.Sql(sql.String(), params...).Find(&results); err != nil {
+ return err
+ }
+
+ query.Result = results
+ return nil
+}
+
+func getAlertNotificationInternal(query *m.GetAlertNotificationsQuery, sess *xorm.Session) error {
+ var sql bytes.Buffer
+ params := make([]interface{}, 0)
+
+ sql.WriteString(`SELECT
+ alert_notification.id,
+ alert_notification.org_id,
+ alert_notification.name,
+ alert_notification.type,
+ alert_notification.created,
+ alert_notification.updated,
+ alert_notification.settings,
+ alert_notification.is_default
+ FROM alert_notification
+ `)
+
+ sql.WriteString(` WHERE alert_notification.org_id = ?`)
+ params = append(params, query.OrgId)
+
+ if query.Name != "" || query.Id != 0 {
+ if query.Name != "" {
+ sql.WriteString(` AND alert_notification.name = ?`)
+ params = append(params, query.Name)
+ }
+
+ if query.Id != 0 {
+ sql.WriteString(` AND alert_notification.id = ?`)
+ params = append(params, query.Id)
+ }
+ }
+
+ results := make([]*m.AlertNotification, 0)
+ if err := sess.Sql(sql.String(), params...).Find(&results); err != nil {
+ return err
+ }
+
+ if len(results) == 0 {
+ query.Result = nil
+ } else {
+ query.Result = results[0]
+ }
+
+ return nil
+}
+
+func CreateAlertNotificationCommand(cmd *m.CreateAlertNotificationCommand) error {
+ return inTransaction(func(sess *xorm.Session) error {
+ existingQuery := &m.GetAlertNotificationsQuery{OrgId: cmd.OrgId, Name: cmd.Name}
+ err := getAlertNotificationInternal(existingQuery, sess)
+
+ if err != nil {
+ return err
+ }
+
+ if existingQuery.Result != nil {
+ return fmt.Errorf("Alert notification name %s already exists", cmd.Name)
+ }
+
+ alertNotification := &m.AlertNotification{
+ OrgId: cmd.OrgId,
+ Name: cmd.Name,
+ Type: cmd.Type,
+ Settings: cmd.Settings,
+ Created: time.Now(),
+ Updated: time.Now(),
+ IsDefault: cmd.IsDefault,
+ }
+
+ if _, err = sess.Insert(alertNotification); err != nil {
+ return err
+ }
+
+ cmd.Result = alertNotification
+ return nil
+ })
+}
+
+func UpdateAlertNotification(cmd *m.UpdateAlertNotificationCommand) error {
+ return inTransaction(func(sess *xorm.Session) (err error) {
+ current := m.AlertNotification{}
+
+ if _, err = sess.Id(cmd.Id).Get(¤t); err != nil {
+ return err
+ }
+
+ // check if name exists
+ sameNameQuery := &m.GetAlertNotificationsQuery{OrgId: cmd.OrgId, Name: cmd.Name}
+ if err := getAlertNotificationInternal(sameNameQuery, sess); err != nil {
+ return err
+ }
+
+ if sameNameQuery.Result != nil && sameNameQuery.Result.Id != current.Id {
+ return fmt.Errorf("Alert notification name %s already exists", cmd.Name)
+ }
+
+ current.Updated = time.Now()
+ current.Settings = cmd.Settings
+ current.Name = cmd.Name
+ current.Type = cmd.Type
+ current.IsDefault = cmd.IsDefault
+
+ sess.UseBool("is_default")
+
+ if affected, err := sess.Id(cmd.Id).Update(current); err != nil {
+ return err
+ } else if affected == 0 {
+ return fmt.Errorf("Could not find alert notification")
+ }
+
+ cmd.Result = ¤t
+ return nil
+ })
+}
diff --git a/pkg/services/sqlstore/alert_notification_test.go b/pkg/services/sqlstore/alert_notification_test.go
new file mode 100644
index 00000000000..d37062fb58f
--- /dev/null
+++ b/pkg/services/sqlstore/alert_notification_test.go
@@ -0,0 +1,98 @@
+package sqlstore
+
+import (
+ "fmt"
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestAlertNotificationSQLAccess(t *testing.T) {
+ Convey("Testing Alert notification sql access", t, func() {
+ InitTestDB(t)
+ var err error
+
+ Convey("Alert notifications should be empty", func() {
+ cmd := &m.GetAlertNotificationsQuery{
+ OrgId: 2,
+ Name: "email",
+ }
+
+ err := GetAlertNotifications(cmd)
+ fmt.Printf("errror %v", err)
+ So(err, ShouldBeNil)
+ So(cmd.Result, ShouldBeNil)
+ })
+
+ Convey("Can save Alert Notification", func() {
+ cmd := &m.CreateAlertNotificationCommand{
+ Name: "ops",
+ Type: "email",
+ OrgId: 1,
+ Settings: simplejson.New(),
+ }
+
+ err = CreateAlertNotificationCommand(cmd)
+ So(err, ShouldBeNil)
+ So(cmd.Result.Id, ShouldNotEqual, 0)
+ So(cmd.Result.OrgId, ShouldNotEqual, 0)
+ So(cmd.Result.Type, ShouldEqual, "email")
+
+ Convey("Cannot save Alert Notification with the same name", func() {
+ err = CreateAlertNotificationCommand(cmd)
+ So(err, ShouldNotBeNil)
+ })
+
+ Convey("Can update alert notification", func() {
+ newCmd := &m.UpdateAlertNotificationCommand{
+ Name: "NewName",
+ Type: "webhook",
+ OrgId: cmd.Result.OrgId,
+ Settings: simplejson.New(),
+ Id: cmd.Result.Id,
+ }
+ err := UpdateAlertNotification(newCmd)
+ So(err, ShouldBeNil)
+ So(newCmd.Result.Name, ShouldEqual, "NewName")
+ })
+ })
+
+ Convey("Can search using an array of ids", func() {
+ cmd1 := m.CreateAlertNotificationCommand{Name: "nagios", Type: "webhook", OrgId: 1, Settings: simplejson.New()}
+ cmd2 := m.CreateAlertNotificationCommand{Name: "slack", Type: "webhook", OrgId: 1, Settings: simplejson.New()}
+ cmd3 := m.CreateAlertNotificationCommand{Name: "ops2", Type: "email", OrgId: 1, Settings: simplejson.New()}
+ cmd4 := m.CreateAlertNotificationCommand{IsDefault: true, Name: "default", Type: "email", OrgId: 1, Settings: simplejson.New()}
+
+ otherOrg := m.CreateAlertNotificationCommand{Name: "default", Type: "email", OrgId: 2, Settings: simplejson.New()}
+
+ So(CreateAlertNotificationCommand(&cmd1), ShouldBeNil)
+ So(CreateAlertNotificationCommand(&cmd2), ShouldBeNil)
+ So(CreateAlertNotificationCommand(&cmd3), ShouldBeNil)
+ So(CreateAlertNotificationCommand(&cmd4), ShouldBeNil)
+ So(CreateAlertNotificationCommand(&otherOrg), ShouldBeNil)
+
+ Convey("search", func() {
+ query := &m.GetAlertNotificationsToSendQuery{
+ Ids: []int64{cmd1.Result.Id, cmd2.Result.Id, 112341231},
+ OrgId: 1,
+ }
+
+ err := GetAlertNotificationsToSend(query)
+ So(err, ShouldBeNil)
+ So(len(query.Result), ShouldEqual, 3)
+ })
+
+ Convey("all", func() {
+ query := &m.GetAllAlertNotificationsQuery{
+ OrgId: 1,
+ }
+
+ err := GetAllAlertNotifications(query)
+ So(err, ShouldBeNil)
+ So(len(query.Result), ShouldEqual, 4)
+ })
+ })
+ })
+}
diff --git a/pkg/services/sqlstore/alert_test.go b/pkg/services/sqlstore/alert_test.go
new file mode 100644
index 00000000000..daf4f774717
--- /dev/null
+++ b/pkg/services/sqlstore/alert_test.go
@@ -0,0 +1,210 @@
+package sqlstore
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestAlertingDataAccess(t *testing.T) {
+ Convey("Testing Alerting data access", t, func() {
+ InitTestDB(t)
+
+ testDash := insertTestDashboard("dashboard with alerts", 1, "alert")
+
+ items := []*m.Alert{
+ {
+ PanelId: 1,
+ DashboardId: testDash.Id,
+ OrgId: testDash.OrgId,
+ Name: "Alerting title",
+ Message: "Alerting message",
+ Settings: simplejson.New(),
+ Frequency: 1,
+ },
+ }
+
+ cmd := m.SaveAlertsCommand{
+ Alerts: items,
+ DashboardId: testDash.Id,
+ OrgId: 1,
+ UserId: 1,
+ }
+
+ err := SaveAlerts(&cmd)
+
+ Convey("Can create one alert", func() {
+ So(err, ShouldBeNil)
+ })
+
+ Convey("Can set new states", func() {
+ Convey("new state ok", func() {
+ cmd := &m.SetAlertStateCommand{
+ AlertId: 1,
+ State: m.AlertStateOK,
+ }
+
+ err = SetAlertState(cmd)
+ So(err, ShouldBeNil)
+ })
+
+ Convey("can pause alert", func() {
+ cmd := &m.PauseAllAlertCommand{
+ Paused: true,
+ }
+
+ err = PauseAllAlerts(cmd)
+ So(err, ShouldBeNil)
+
+ Convey("cannot updated paused alert", func() {
+ cmd := &m.SetAlertStateCommand{
+ AlertId: 1,
+ State: m.AlertStateOK,
+ }
+
+ err = SetAlertState(cmd)
+ So(err, ShouldNotBeNil)
+ })
+ })
+ })
+
+ Convey("Can read properties", func() {
+ alertQuery := m.GetAlertsQuery{DashboardId: testDash.Id, PanelId: 1, OrgId: 1}
+ err2 := HandleAlertsQuery(&alertQuery)
+
+ alert := alertQuery.Result[0]
+ So(err2, ShouldBeNil)
+ So(alert.Name, ShouldEqual, "Alerting title")
+ So(alert.Message, ShouldEqual, "Alerting message")
+ So(alert.State, ShouldEqual, "pending")
+ So(alert.Frequency, ShouldEqual, 1)
+ })
+
+ Convey("Alerts with same dashboard id and panel id should update", func() {
+ modifiedItems := items
+ modifiedItems[0].Name = "Name"
+
+ modifiedCmd := m.SaveAlertsCommand{
+ DashboardId: testDash.Id,
+ OrgId: 1,
+ UserId: 1,
+ Alerts: modifiedItems,
+ }
+
+ err := SaveAlerts(&modifiedCmd)
+
+ Convey("Can save alerts with same dashboard and panel id", func() {
+ So(err, ShouldBeNil)
+ })
+
+ Convey("Alerts should be updated", func() {
+ query := m.GetAlertsQuery{DashboardId: testDash.Id, OrgId: 1}
+ err2 := HandleAlertsQuery(&query)
+
+ So(err2, ShouldBeNil)
+ So(len(query.Result), ShouldEqual, 1)
+ So(query.Result[0].Name, ShouldEqual, "Name")
+
+ Convey("Alert state should not be updated", func() {
+ So(query.Result[0].State, ShouldEqual, "pending")
+ })
+ })
+
+ Convey("Updates without changes should be ignored", func() {
+ err3 := SaveAlerts(&modifiedCmd)
+ So(err3, ShouldBeNil)
+ })
+ })
+
+ Convey("Multiple alerts per dashboard", func() {
+ multipleItems := []*m.Alert{
+ {
+ DashboardId: testDash.Id,
+ PanelId: 1,
+ Name: "1",
+ OrgId: 1,
+ Settings: simplejson.New(),
+ },
+ {
+ DashboardId: testDash.Id,
+ PanelId: 2,
+ Name: "2",
+ OrgId: 1,
+ Settings: simplejson.New(),
+ },
+ {
+ DashboardId: testDash.Id,
+ PanelId: 3,
+ Name: "3",
+ OrgId: 1,
+ Settings: simplejson.New(),
+ },
+ }
+
+ cmd.Alerts = multipleItems
+ err = SaveAlerts(&cmd)
+
+ Convey("Should save 3 dashboards", func() {
+ So(err, ShouldBeNil)
+
+ queryForDashboard := m.GetAlertsQuery{DashboardId: testDash.Id, OrgId: 1}
+ err2 := HandleAlertsQuery(&queryForDashboard)
+
+ So(err2, ShouldBeNil)
+ So(len(queryForDashboard.Result), ShouldEqual, 3)
+ })
+
+ Convey("should updated two dashboards and delete one", func() {
+ missingOneAlert := multipleItems[:2]
+
+ cmd.Alerts = missingOneAlert
+ err = SaveAlerts(&cmd)
+
+ Convey("should delete the missing alert", func() {
+ query := m.GetAlertsQuery{DashboardId: testDash.Id, OrgId: 1}
+ err2 := HandleAlertsQuery(&query)
+ So(err2, ShouldBeNil)
+ So(len(query.Result), ShouldEqual, 2)
+ })
+ })
+ })
+
+ Convey("When dashboard is removed", func() {
+ items := []*m.Alert{
+ {
+ PanelId: 1,
+ DashboardId: testDash.Id,
+ Name: "Alerting title",
+ Message: "Alerting message",
+ },
+ }
+
+ cmd := m.SaveAlertsCommand{
+ Alerts: items,
+ DashboardId: testDash.Id,
+ OrgId: 1,
+ UserId: 1,
+ }
+
+ SaveAlerts(&cmd)
+
+ err = DeleteDashboard(&m.DeleteDashboardCommand{
+ OrgId: 1,
+ Slug: testDash.Slug,
+ })
+
+ So(err, ShouldBeNil)
+
+ Convey("Alerts should be removed", func() {
+ query := m.GetAlertsQuery{DashboardId: testDash.Id, OrgId: 1}
+ err2 := HandleAlertsQuery(&query)
+
+ So(testDash.Id, ShouldEqual, 1)
+ So(err2, ShouldBeNil)
+ So(len(query.Result), ShouldEqual, 0)
+ })
+ })
+ })
+}
diff --git a/pkg/services/sqlstore/annotation.go b/pkg/services/sqlstore/annotation.go
new file mode 100644
index 00000000000..e219f48d2fe
--- /dev/null
+++ b/pkg/services/sqlstore/annotation.go
@@ -0,0 +1,100 @@
+package sqlstore
+
+import (
+ "bytes"
+ "fmt"
+ "strings"
+
+ "github.com/go-xorm/xorm"
+ "github.com/grafana/grafana/pkg/services/annotations"
+)
+
+type SqlAnnotationRepo struct {
+}
+
+func (r *SqlAnnotationRepo) Save(item *annotations.Item) error {
+ return inTransaction(func(sess *xorm.Session) error {
+
+ if _, err := sess.Table("annotation").Insert(item); err != nil {
+ return err
+ }
+
+ return nil
+ })
+}
+
+func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.Item, error) {
+ var sql bytes.Buffer
+ params := make([]interface{}, 0)
+
+ sql.WriteString(`SELECT *
+ from annotation
+ `)
+
+ sql.WriteString(`WHERE org_id = ?`)
+ params = append(params, query.OrgId)
+
+ if query.AlertId != 0 {
+ sql.WriteString(` AND alert_id = ?`)
+ params = append(params, query.AlertId)
+ }
+
+ if query.AlertId != 0 {
+ sql.WriteString(` AND alert_id = ?`)
+ params = append(params, query.AlertId)
+ }
+
+ if query.DashboardId != 0 {
+ sql.WriteString(` AND dashboard_id = ?`)
+ params = append(params, query.DashboardId)
+ }
+
+ if query.PanelId != 0 {
+ sql.WriteString(` AND panel_id = ?`)
+ params = append(params, query.PanelId)
+ }
+
+ if query.From > 0 && query.To > 0 {
+ sql.WriteString(` AND epoch BETWEEN ? AND ?`)
+ params = append(params, query.From, query.To)
+ }
+
+ if query.Type != "" {
+ sql.WriteString(` AND type = ?`)
+ params = append(params, string(query.Type))
+ }
+
+ if len(query.NewState) > 0 {
+ sql.WriteString(` AND new_state IN (?` + strings.Repeat(",?", len(query.NewState)-1) + ")")
+ for _, v := range query.NewState {
+ params = append(params, v)
+ }
+ }
+
+ if query.Limit == 0 {
+ query.Limit = 10
+ }
+
+ sql.WriteString(fmt.Sprintf(" ORDER BY epoch DESC LIMIT %v", query.Limit))
+
+ items := make([]*annotations.Item, 0)
+ if err := x.Sql(sql.String(), params...).Find(&items); err != nil {
+ return nil, err
+ }
+
+ return items, nil
+}
+
+func (r *SqlAnnotationRepo) Delete(params *annotations.DeleteParams) error {
+ return inTransaction(func(sess *xorm.Session) error {
+
+ sql := "DELETE FROM annotation WHERE dashboard_id = ? AND panel_id = ?"
+
+ _, err := sess.Exec(sql, params.DashboardId, params.PanelId)
+ if err != nil {
+ return err
+ }
+
+ return nil
+ })
+}
diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go
index 396d507cfd2..7bd65ac4da8 100644
--- a/pkg/services/sqlstore/dashboard.go
+++ b/pkg/services/sqlstore/dashboard.go
@@ -18,6 +18,8 @@ func init() {
bus.AddHandler("sql", DeleteDashboard)
bus.AddHandler("sql", SearchDashboards)
bus.AddHandler("sql", GetDashboardTags)
+ bus.AddHandler("sql", GetDashboardSlugById)
+ bus.AddHandler("sql", GetDashboardsByPluginId)
}
func SaveDashboard(cmd *m.SaveDashboardCommand) error {
@@ -44,6 +46,11 @@ func SaveDashboard(cmd *m.SaveDashboardCommand) error {
return m.ErrDashboardVersionMismatch
}
}
+
+ // do not allow plugin dashboard updates without overwrite flag
+ if existing.PluginId != "" && cmd.Overwrite == false {
+ return m.UpdatePluginDashboardError{PluginId: existing.PluginId}
+ }
}
sameTitleExists, err := sess.Where("org_id=? AND slug=?", dash.OrgId, dash.Slug).Get(&sameTitle)
@@ -215,7 +222,7 @@ func GetDashboardTags(query *m.GetDashboardTagsQuery) error {
func DeleteDashboard(cmd *m.DeleteDashboardCommand) error {
return inTransaction2(func(sess *session) error {
dashboard := m.Dashboard{Slug: cmd.Slug, OrgId: cmd.OrgId}
- has, err := x.Get(&dashboard)
+ has, err := sess.Get(&dashboard)
if err != nil {
return err
} else if has == false {
@@ -226,6 +233,7 @@ func DeleteDashboard(cmd *m.DeleteDashboardCommand) error {
"DELETE FROM dashboard_tag WHERE dashboard_id = ? ",
"DELETE FROM star WHERE dashboard_id = ? ",
"DELETE FROM dashboard WHERE id = ?",
+ "DELETE FROM playlist_item WHERE type = 'dashboard_by_id' AND value = ?",
}
for _, sql := range deletes {
@@ -235,6 +243,10 @@ func DeleteDashboard(cmd *m.DeleteDashboardCommand) error {
}
}
+ if err := DeleteAlertDefinition(dashboard.Id, sess.Session); err != nil {
+ return nil
+ }
+
return nil
})
}
@@ -244,10 +256,10 @@ func GetDashboards(query *m.GetDashboardsQuery) error {
return m.ErrCommandValidationFailed
}
- var dashboards = make([]m.Dashboard, 0)
+ var dashboards = make([]*m.Dashboard, 0)
err := x.In("id", query.DashboardIds).Find(&dashboards)
- query.Result = &dashboards
+ query.Result = dashboards
if err != nil {
return err
@@ -255,3 +267,36 @@ func GetDashboards(query *m.GetDashboardsQuery) error {
return nil
}
+
+func GetDashboardsByPluginId(query *m.GetDashboardsByPluginIdQuery) error {
+ var dashboards = make([]*m.Dashboard, 0)
+
+ err := x.Where("org_id=? AND plugin_id=?", query.OrgId, query.PluginId).Find(&dashboards)
+ query.Result = dashboards
+
+ if err != nil {
+ return err
+ }
+
+ return nil
+}
+
+type DashboardSlugDTO struct {
+ Slug string
+}
+
+func GetDashboardSlugById(query *m.GetDashboardSlugByIdQuery) error {
+ var rawSql = `SELECT slug from dashboard WHERE Id=?`
+ var slug = DashboardSlugDTO{}
+
+ exists, err := x.Sql(rawSql, query.Id).Get(&slug)
+
+ if err != nil {
+ return err
+ } else if exists == false {
+ return m.ErrDashboardNotFound
+ }
+
+ query.Result = slug.Slug
+ return nil
+}
diff --git a/pkg/services/sqlstore/dashboard_snapshot.go b/pkg/services/sqlstore/dashboard_snapshot.go
index fc94a91cce5..bb3a4f8f57e 100644
--- a/pkg/services/sqlstore/dashboard_snapshot.go
+++ b/pkg/services/sqlstore/dashboard_snapshot.go
@@ -6,6 +6,7 @@ import (
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
)
func init() {
@@ -13,6 +14,25 @@ func init() {
bus.AddHandler("sql", GetDashboardSnapshot)
bus.AddHandler("sql", DeleteDashboardSnapshot)
bus.AddHandler("sql", SearchDashboardSnapshots)
+ bus.AddHandler("sql", DeleteExpiredSnapshots)
+}
+
+func DeleteExpiredSnapshots(cmd *m.DeleteExpiredSnapshotsCommand) error {
+ return inTransaction(func(sess *xorm.Session) error {
+ var expiredCount int64 = 0
+
+ if setting.SnapShotRemoveExpired {
+ deleteExpiredSql := "DELETE FROM dashboard_snapshot WHERE expires < ?"
+ expiredResponse, err := x.Exec(deleteExpiredSql, time.Now)
+ if err != nil {
+ return err
+ }
+ expiredCount, _ = expiredResponse.RowsAffected()
+ }
+
+ sqlog.Debug("Deleted old/expired snaphots", "expired", expiredCount)
+ return nil
+ })
}
func CreateDashboardSnapshot(cmd *m.CreateDashboardSnapshotCommand) error {
diff --git a/pkg/services/sqlstore/dashboard_test.go b/pkg/services/sqlstore/dashboard_test.go
index 609639f7788..a055500592b 100644
--- a/pkg/services/sqlstore/dashboard_test.go
+++ b/pkg/services/sqlstore/dashboard_test.go
@@ -5,6 +5,7 @@ import (
. "github.com/smartystreets/goconvey/convey"
+ "github.com/gosimple/slug"
"github.com/grafana/grafana/pkg/components/simplejson"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/search"
@@ -55,6 +56,19 @@ func TestDashboardDataAccess(t *testing.T) {
So(query.Result.Slug, ShouldEqual, "test-dash-23")
})
+ Convey("Should be able to delete dashboard", func() {
+ insertTestDashboard("delete me", 1, "delete this")
+
+ dashboardSlug := slug.Make("delete me")
+
+ err := DeleteDashboard(&m.DeleteDashboardCommand{
+ Slug: dashboardSlug,
+ OrgId: 1,
+ })
+
+ So(err, ShouldBeNil)
+ })
+
Convey("Should return error if no dashboard is updated", func() {
cmd := m.SaveDashboardCommand{
OrgId: 1,
diff --git a/pkg/services/sqlstore/datasource.go b/pkg/services/sqlstore/datasource.go
index 55a95413640..57abaf35083 100644
--- a/pkg/services/sqlstore/datasource.go
+++ b/pkg/services/sqlstore/datasource.go
@@ -4,6 +4,7 @@ import (
"time"
"github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/securejsondata"
m "github.com/grafana/grafana/pkg/models"
"github.com/go-xorm/xorm"
@@ -19,27 +20,31 @@ func init() {
}
func GetDataSourceById(query *m.GetDataSourceByIdQuery) error {
- sess := x.Limit(100, 0).Where("org_id=? AND id=?", query.OrgId, query.Id)
- has, err := sess.Get(&query.Result)
+ datasource := m.DataSource{OrgId: query.OrgId, Id: query.Id}
+ has, err := x.Get(&datasource)
if !has {
return m.ErrDataSourceNotFound
}
+
+ query.Result = &datasource
return err
}
func GetDataSourceByName(query *m.GetDataSourceByNameQuery) error {
- sess := x.Limit(100, 0).Where("org_id=? AND name=?", query.OrgId, query.Name)
- has, err := sess.Get(&query.Result)
+ datasource := m.DataSource{OrgId: query.OrgId, Name: query.Name}
+ has, err := x.Get(&datasource)
if !has {
return m.ErrDataSourceNotFound
}
+
+ query.Result = &datasource
return err
}
func GetDataSources(query *m.GetDataSourcesQuery) error {
- sess := x.Limit(100, 0).Where("org_id=?", query.OrgId).Asc("name")
+ sess := x.Limit(1000, 0).Where("org_id=?", query.OrgId).Asc("name")
query.Result = make([]*m.DataSource, 0)
return sess.Find(&query.Result)
@@ -56,6 +61,13 @@ func DeleteDataSource(cmd *m.DeleteDataSourceCommand) error {
func AddDataSource(cmd *m.AddDataSourceCommand) error {
return inTransaction(func(sess *xorm.Session) error {
+ existing := m.DataSource{OrgId: cmd.OrgId, Name: cmd.Name}
+ has, _ := sess.Get(&existing)
+
+ if has {
+ return m.ErrDataSourceNameExists
+ }
+
ds := &m.DataSource{
OrgId: cmd.OrgId,
Name: cmd.Name,
@@ -71,6 +83,7 @@ func AddDataSource(cmd *m.AddDataSourceCommand) error {
BasicAuthPassword: cmd.BasicAuthPassword,
WithCredentials: cmd.WithCredentials,
JsonData: cmd.JsonData,
+ SecureJsonData: securejsondata.GetEncryptedJsonData(cmd.SecureJsonData),
Created: time.Now(),
Updated: time.Now(),
}
@@ -117,6 +130,7 @@ func UpdateDataSource(cmd *m.UpdateDataSourceCommand) error {
BasicAuthPassword: cmd.BasicAuthPassword,
WithCredentials: cmd.WithCredentials,
JsonData: cmd.JsonData,
+ SecureJsonData: securejsondata.GetEncryptedJsonData(cmd.SecureJsonData),
Updated: time.Now(),
}
diff --git a/pkg/services/sqlstore/datasource_test.go b/pkg/services/sqlstore/datasource_test.go
index 4142602c472..35752eeaafc 100644
--- a/pkg/services/sqlstore/datasource_test.go
+++ b/pkg/services/sqlstore/datasource_test.go
@@ -12,8 +12,6 @@ import (
)
func InitTestDB(t *testing.T) {
-
- t.Log("InitTestDB")
x, err := xorm.NewEngine(sqlutil.TestDB_Sqlite3.DriverName, sqlutil.TestDB_Sqlite3.ConnStr)
//x, err := xorm.NewEngine(sqlutil.TestDB_Mysql.DriverName, sqlutil.TestDB_Mysql.ConnStr)
//x, err := xorm.NewEngine(sqlutil.TestDB_Postgres.DriverName, sqlutil.TestDB_Postgres.ConnStr)
@@ -24,7 +22,7 @@ func InitTestDB(t *testing.T) {
sqlutil.CleanDB(x)
- if err := SetEngine(x, false); err != nil {
+ if err := SetEngine(x); err != nil {
t.Fatal(err)
}
}
@@ -43,6 +41,7 @@ func TestDataAccess(t *testing.T) {
err := AddDataSource(&m.AddDataSourceCommand{
OrgId: 10,
+ Name: "laban",
Type: m.DS_INFLUXDB,
Access: m.DS_ACCESS_DIRECT,
Url: "http://test",
@@ -65,15 +64,19 @@ func TestDataAccess(t *testing.T) {
Convey("Given a datasource", func() {
- AddDataSource(&m.AddDataSourceCommand{
+ err := AddDataSource(&m.AddDataSourceCommand{
OrgId: 10,
+ Name: "nisse",
Type: m.DS_GRAPHITE,
Access: m.DS_ACCESS_DIRECT,
Url: "http://test",
})
+ So(err, ShouldBeNil)
query := m.GetDataSourcesQuery{OrgId: 10}
- GetDataSources(&query)
+ err = GetDataSources(&query)
+ So(err, ShouldBeNil)
+
ds := query.Result[0]
Convey("Can delete datasource", func() {
diff --git a/pkg/services/sqlstore/migrations/alert_mig.go b/pkg/services/sqlstore/migrations/alert_mig.go
new file mode 100644
index 00000000000..b6956be41c7
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/alert_mig.go
@@ -0,0 +1,70 @@
+package migrations
+
+import (
+ . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+)
+
+func addAlertMigrations(mg *Migrator) {
+
+ alertV1 := Table{
+ Name: "alert",
+ Columns: []*Column{
+ {Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+ {Name: "version", Type: DB_BigInt, Nullable: false},
+ {Name: "dashboard_id", Type: DB_BigInt, Nullable: false},
+ {Name: "panel_id", Type: DB_BigInt, Nullable: false},
+ {Name: "org_id", Type: DB_BigInt, Nullable: false},
+ {Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+ {Name: "message", Type: DB_Text, Nullable: false},
+ {Name: "state", Type: DB_NVarchar, Length: 255, Nullable: false},
+ {Name: "settings", Type: DB_Text, Nullable: false},
+ {Name: "frequency", Type: DB_BigInt, Nullable: false},
+ {Name: "handler", Type: DB_BigInt, Nullable: false},
+ {Name: "severity", Type: DB_Text, Nullable: false},
+ {Name: "silenced", Type: DB_Bool, Nullable: false},
+ {Name: "execution_error", Type: DB_Text, Nullable: false},
+ {Name: "eval_data", Type: DB_Text, Nullable: true},
+ {Name: "eval_date", Type: DB_DateTime, Nullable: true},
+ {Name: "new_state_date", Type: DB_DateTime, Nullable: false},
+ {Name: "state_changes", Type: DB_Int, Nullable: false},
+ {Name: "created", Type: DB_DateTime, Nullable: false},
+ {Name: "updated", Type: DB_DateTime, Nullable: false},
+ },
+ Indices: []*Index{
+ {Cols: []string{"org_id", "id"}, Type: IndexType},
+ {Cols: []string{"state"}, Type: IndexType},
+ {Cols: []string{"dashboard_id"}, Type: IndexType},
+ },
+ }
+
+ // create table
+ mg.AddMigration("create alert table v1", NewAddTableMigration(alertV1))
+
+ // create indices
+ mg.AddMigration("add index alert org_id & id ", NewAddIndexMigration(alertV1, alertV1.Indices[0]))
+ mg.AddMigration("add index alert state", NewAddIndexMigration(alertV1, alertV1.Indices[1]))
+ mg.AddMigration("add index alert dashboard_id", NewAddIndexMigration(alertV1, alertV1.Indices[2]))
+
+ alert_notification := Table{
+ Name: "alert_notification",
+ Columns: []*Column{
+ {Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+ {Name: "org_id", Type: DB_BigInt, Nullable: false},
+ {Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+ {Name: "type", Type: DB_NVarchar, Length: 255, Nullable: false},
+ {Name: "settings", Type: DB_Text, Nullable: false},
+ {Name: "created", Type: DB_DateTime, Nullable: false},
+ {Name: "updated", Type: DB_DateTime, Nullable: false},
+ },
+ Indices: []*Index{
+ {Cols: []string{"org_id", "name"}, Type: UniqueIndex},
+ },
+ }
+
+ mg.AddMigration("create alert_notification table v1", NewAddTableMigration(alert_notification))
+ mg.AddMigration("Add column is_default", NewAddColumnMigration(alert_notification, &Column{
+ Name: "is_default", Type: DB_Bool, Nullable: false, Default: "0",
+ }))
+ mg.AddMigration("add index alert_notification org_id & name", NewAddIndexMigration(alert_notification, alert_notification.Indices[0]))
+
+}
diff --git a/pkg/services/sqlstore/migrations/annotation_mig.go b/pkg/services/sqlstore/migrations/annotation_mig.go
new file mode 100644
index 00000000000..a307100ad3c
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/annotation_mig.go
@@ -0,0 +1,47 @@
+package migrations
+
+import (
+ . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+)
+
+func addAnnotationMig(mg *Migrator) {
+
+ table := Table{
+ Name: "annotation",
+ Columns: []*Column{
+ {Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+ {Name: "org_id", Type: DB_BigInt, Nullable: false},
+ {Name: "alert_id", Type: DB_BigInt, Nullable: true},
+ {Name: "user_id", Type: DB_BigInt, Nullable: true},
+ {Name: "dashboard_id", Type: DB_BigInt, Nullable: true},
+ {Name: "panel_id", Type: DB_BigInt, Nullable: true},
+ {Name: "category_id", Type: DB_BigInt, Nullable: true},
+ {Name: "type", Type: DB_NVarchar, Length: 25, Nullable: false},
+ {Name: "title", Type: DB_Text, Nullable: false},
+ {Name: "text", Type: DB_Text, Nullable: false},
+ {Name: "metric", Type: DB_NVarchar, Length: 255, Nullable: true},
+ {Name: "prev_state", Type: DB_NVarchar, Length: 25, Nullable: false},
+ {Name: "new_state", Type: DB_NVarchar, Length: 25, Nullable: false},
+ {Name: "data", Type: DB_Text, Nullable: false},
+ {Name: "epoch", Type: DB_BigInt, Nullable: false},
+ },
+ Indices: []*Index{
+ {Cols: []string{"org_id", "alert_id"}, Type: IndexType},
+ {Cols: []string{"org_id", "type"}, Type: IndexType},
+ {Cols: []string{"org_id", "category_id"}, Type: IndexType},
+ {Cols: []string{"org_id", "dashboard_id", "panel_id", "epoch"}, Type: IndexType},
+ {Cols: []string{"org_id", "epoch"}, Type: IndexType},
+ },
+ }
+
+ mg.AddMigration("Drop old annotation table v4", NewDropTableMigration("annotation"))
+
+ mg.AddMigration("create annotation table v5", NewAddTableMigration(table))
+
+ // create indices
+ mg.AddMigration("add index annotation 0 v3", NewAddIndexMigration(table, table.Indices[0]))
+ mg.AddMigration("add index annotation 1 v3", NewAddIndexMigration(table, table.Indices[1]))
+ mg.AddMigration("add index annotation 2 v3", NewAddIndexMigration(table, table.Indices[2]))
+ mg.AddMigration("add index annotation 3 v3", NewAddIndexMigration(table, table.Indices[3]))
+ mg.AddMigration("add index annotation 4 v3", NewAddIndexMigration(table, table.Indices[4]))
+}
diff --git a/pkg/services/sqlstore/migrations/dashboard_mig.go b/pkg/services/sqlstore/migrations/dashboard_mig.go
index a4a8629b331..283501d366f 100644
--- a/pkg/services/sqlstore/migrations/dashboard_mig.go
+++ b/pkg/services/sqlstore/migrations/dashboard_mig.go
@@ -102,4 +102,27 @@ func addDashboardMigration(mg *Migrator) {
mg.AddMigration("Add column created_by in dashboard - v2", NewAddColumnMigration(dashboardV2, &Column{
Name: "created_by", Type: DB_Int, Nullable: true,
}))
+
+ // add column to store gnetId
+ mg.AddMigration("Add column gnetId in dashboard", NewAddColumnMigration(dashboardV2, &Column{
+ Name: "gnet_id", Type: DB_BigInt, Nullable: true,
+ }))
+
+ mg.AddMigration("Add index for gnetId in dashboard", NewAddIndexMigration(dashboardV2, &Index{
+ Cols: []string{"gnet_id"}, Type: IndexType,
+ }))
+
+ // add column to store plugin_id
+ mg.AddMigration("Add column plugin_id in dashboard", NewAddColumnMigration(dashboardV2, &Column{
+ Name: "plugin_id", Type: DB_NVarchar, Nullable: true, Length: 255,
+ }))
+
+ mg.AddMigration("Add index for plugin_id in dashboard", NewAddIndexMigration(dashboardV2, &Index{
+ Cols: []string{"org_id", "plugin_id"}, Type: IndexType,
+ }))
+
+ // dashboard_id index for dashboard_tag table
+ mg.AddMigration("Add index for dashboard_id in dashboard_tag", NewAddIndexMigration(dashboardTagV1, &Index{
+ Cols: []string{"dashboard_id"}, Type: IndexType,
+ }))
}
diff --git a/pkg/services/sqlstore/migrations/datasource_mig.go b/pkg/services/sqlstore/migrations/datasource_mig.go
index 90f7dac85e6..396f80df99f 100644
--- a/pkg/services/sqlstore/migrations/datasource_mig.go
+++ b/pkg/services/sqlstore/migrations/datasource_mig.go
@@ -101,4 +101,9 @@ func addDataSourceMigration(mg *Migrator) {
mg.AddMigration("Add column with_credentials", NewAddColumnMigration(tableV2, &Column{
Name: "with_credentials", Type: DB_Bool, Nullable: false, Default: "0",
}))
+
+ // add column that can store TLS client auth data
+ mg.AddMigration("Add secure json data column", NewAddColumnMigration(tableV2, &Column{
+ Name: "secure_json_data", Type: DB_Text, Nullable: true,
+ }))
}
diff --git a/pkg/services/sqlstore/migrations/heartbeat_mig.go b/pkg/services/sqlstore/migrations/heartbeat_mig.go
new file mode 100644
index 00000000000..e0ee7a5f88f
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/heartbeat_mig.go
@@ -0,0 +1,18 @@
+package migrations
+
+// // create table
+// mg.AddMigration("create alert table v1", NewAddTableMigration(alertV1))
+//
+// alert_heartbeat := Table{
+// Name: "alert_heartbeat",
+// Columns: []*Column{
+// {Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+// {Name: "server_id", Type: DB_NVarchar, Length: 50, Nullable: false},
+// {Name: "created", Type: DB_DateTime, Nullable: false},
+// {Name: "updated", Type: DB_DateTime, Nullable: false},
+// },
+// }
+//
+// mg.AddMigration("create alert_heartbeat table v1", NewAddTableMigration(alert_heartbeat))
+//
+//
diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go
index 7a6ba554246..f0f69ee0e23 100644
--- a/pkg/services/sqlstore/migrations/migrations.go
+++ b/pkg/services/sqlstore/migrations/migrations.go
@@ -22,6 +22,8 @@ func AddMigrations(mg *Migrator) {
addSessionMigration(mg)
addPlaylistMigrations(mg)
addPreferencesMigrations(mg)
+ addAlertMigrations(mg)
+ addAnnotationMig(mg)
}
func addMigrationLogMigrations(mg *Migrator) {
diff --git a/pkg/services/sqlstore/migrations/migrations_test.go b/pkg/services/sqlstore/migrations/migrations_test.go
index 0278ea6632b..5bddf6ff605 100644
--- a/pkg/services/sqlstore/migrations/migrations_test.go
+++ b/pkg/services/sqlstore/migrations/migrations_test.go
@@ -8,6 +8,7 @@ import (
"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
. "github.com/smartystreets/goconvey/convey"
+ //"github.com/grafana/grafana/pkg/log"
)
var indexTypes = []string{"Unknown", "INDEX", "UNIQUE INDEX"}
@@ -28,7 +29,6 @@ func TestMigrations(t *testing.T) {
sqlutil.CleanDB(x)
mg := NewMigrator(x)
- //mg.LogLevel = log.DEBUG
AddMigrations(mg)
err = mg.Start()
diff --git a/pkg/services/sqlstore/migrations/plugin_setting.go b/pkg/services/sqlstore/migrations/plugin_setting.go
index 4a8729691d3..0700ab67d2f 100644
--- a/pkg/services/sqlstore/migrations/plugin_setting.go
+++ b/pkg/services/sqlstore/migrations/plugin_setting.go
@@ -26,4 +26,10 @@ func addAppSettingsMigration(mg *Migrator) {
//------- indexes ------------------
addTableIndicesMigrations(mg, "v1", pluginSettingTable)
+
+ // add column to store installed version
+ mg.AddMigration("Add column plugin_version to plugin_settings", NewAddColumnMigration(pluginSettingTable, &Column{
+ Name: "plugin_version", Type: DB_NVarchar, Nullable: true, Length: 50,
+ }))
+
}
diff --git a/pkg/services/sqlstore/migrations/preferences_mig.go b/pkg/services/sqlstore/migrations/preferences_mig.go
index 0ce01857b75..67a8169a7a8 100644
--- a/pkg/services/sqlstore/migrations/preferences_mig.go
+++ b/pkg/services/sqlstore/migrations/preferences_mig.go
@@ -4,17 +4,29 @@ import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
func addPreferencesMigrations(mg *Migrator) {
- preferencesV1 := Table{
+ mg.AddMigration("drop preferences table v2", NewDropTableMigration("preferences"))
+
+ preferencesV2 := Table{
Name: "preferences",
Columns: []*Column{
{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
- {Name: "pref_id", Type: DB_Int, Nullable: false},
- {Name: "pref_type", Type: DB_NVarchar, Length: 255, Nullable: false},
- {Name: "pref_data", Type: DB_Text, Nullable: false},
+ {Name: "org_id", Type: DB_BigInt, Nullable: false},
+ {Name: "user_id", Type: DB_BigInt, Nullable: false},
+ {Name: "version", Type: DB_Int, Nullable: false},
+ {Name: "home_dashboard_id", Type: DB_BigInt, Nullable: false},
+ {Name: "timezone", Type: DB_NVarchar, Length: 50, Nullable: false},
+ {Name: "theme", Type: DB_NVarchar, Length: 20, Nullable: false},
+ {Name: "created", Type: DB_DateTime, Nullable: false},
+ {Name: "updated", Type: DB_DateTime, Nullable: false},
+ },
+ Indices: []*Index{
+ {Cols: []string{"org_id"}},
+ {Cols: []string{"user_id"}},
},
}
- // create table
- mg.AddMigration("create preferences table v1", NewAddTableMigration(preferencesV1))
+ mg.AddMigration("drop preferences table v3", NewDropTableMigration("preferences"))
+ // create table
+ mg.AddMigration("create preferences table v3", NewAddTableMigration(preferencesV2))
}
diff --git a/pkg/services/sqlstore/migrations/user_mig.go b/pkg/services/sqlstore/migrations/user_mig.go
index 51db4d74857..67446f64d1a 100644
--- a/pkg/services/sqlstore/migrations/user_mig.go
+++ b/pkg/services/sqlstore/migrations/user_mig.go
@@ -88,4 +88,8 @@ func addUserMigrations(mg *Migrator) {
}))
mg.AddMigration("Drop old table user_v1", NewDropTableMigration("user_v1"))
+
+ mg.AddMigration("Add column help_flags1 to user table", NewAddColumnMigration(userV2, &Column{
+ Name: "help_flags1", Type: DB_BigInt, Nullable: false, Default: "0",
+ }))
}
diff --git a/pkg/services/sqlstore/migrator/dialect.go b/pkg/services/sqlstore/migrator/dialect.go
index 0c94eb82234..4473b560428 100644
--- a/pkg/services/sqlstore/migrator/dialect.go
+++ b/pkg/services/sqlstore/migrator/dialect.go
@@ -18,6 +18,7 @@ type Dialect interface {
SupportEngine() bool
LikeStr() string
Default(col *Column) string
+ BooleanStr(bool) string
CreateIndexSql(tableName string, index *Index) string
CreateTableSql(table *Table) string
diff --git a/pkg/services/sqlstore/migrator/migrator.go b/pkg/services/sqlstore/migrator/migrator.go
index 48000e34ca2..64831ee46b4 100644
--- a/pkg/services/sqlstore/migrator/migrator.go
+++ b/pkg/services/sqlstore/migrator/migrator.go
@@ -11,11 +11,10 @@ import (
)
type Migrator struct {
- LogLevel log.LogLevel
-
x *xorm.Engine
dialect Dialect
migrations []Migration
+ Logger log.Logger
}
type MigrationLog struct {
@@ -30,7 +29,7 @@ type MigrationLog struct {
func NewMigrator(engine *xorm.Engine) *Migrator {
mg := &Migrator{}
mg.x = engine
- mg.LogLevel = log.WARN
+ mg.Logger = log.New("migrator")
mg.migrations = make([]Migration, 0)
mg.dialect = NewDialect(mg.x.DriverName())
return mg
@@ -69,9 +68,7 @@ func (mg *Migrator) GetMigrationLog() (map[string]MigrationLog, error) {
}
func (mg *Migrator) Start() error {
- if mg.LogLevel <= log.INFO {
- log.Info("Migrator: Starting DB migration")
- }
+ mg.Logger.Info("Starting DB migration")
logMap, err := mg.GetMigrationLog()
if err != nil {
@@ -81,9 +78,7 @@ func (mg *Migrator) Start() error {
for _, m := range mg.migrations {
_, exists := logMap[m.Id()]
if exists {
- if mg.LogLevel <= log.DEBUG {
- log.Debug("Migrator: Skipping migration: %v, Already executed", m.Id())
- }
+ mg.Logger.Debug("Skipping migration: Already executed", "id", m.Id())
continue
}
@@ -95,50 +90,47 @@ func (mg *Migrator) Start() error {
Timestamp: time.Now(),
}
- if mg.LogLevel <= log.DEBUG {
- log.Debug("Migrator: Executing SQL: \n %v \n", sql)
- }
+ mg.Logger.Debug("Executing", "sql", sql)
- if err := mg.exec(m); err != nil {
- log.Error(3, "Migrator: error: \n%s:\n%s", err, sql)
- record.Error = err.Error()
- mg.x.Insert(&record)
+ err := mg.inTransaction(func(sess *xorm.Session) error {
+
+ if err := mg.exec(m, sess); err != nil {
+ mg.Logger.Error("Exec failed", "error", err, "sql", sql)
+ record.Error = err.Error()
+ sess.Insert(&record)
+ return err
+ } else {
+ record.Success = true
+ sess.Insert(&record)
+ }
+
+ return nil
+ })
+
+ if err != nil {
return err
- } else {
- record.Success = true
- mg.x.Insert(&record)
}
}
return nil
}
-func (mg *Migrator) exec(m Migration) error {
- if mg.LogLevel <= log.INFO {
- log.Info("Migrator: exec migration id: %v", m.Id())
+func (mg *Migrator) exec(m Migration, sess *xorm.Session) error {
+ mg.Logger.Info("Executing migration", "id", m.Id())
+
+ condition := m.GetCondition()
+ if condition != nil {
+ sql, args := condition.Sql(mg.dialect)
+ results, err := sess.Query(sql, args...)
+ if err != nil || len(results) == 0 {
+ mg.Logger.Info("Skipping migration condition not fulfilled", "id", m.Id())
+ return sess.Rollback()
+ }
}
- err := mg.inTransaction(func(sess *xorm.Session) error {
-
- condition := m.GetCondition()
- if condition != nil {
- sql, args := condition.Sql(mg.dialect)
- results, err := sess.Query(sql, args...)
- if err != nil || len(results) == 0 {
- log.Info("Migrator: skipping migration id: %v, condition not fulfilled", m.Id())
- return sess.Rollback()
- }
- }
-
- _, err := sess.Exec(m.Sql(mg.dialect))
- if err != nil {
- log.Error(3, "Migrator: exec FAILED migration id: %v, err: %v", m.Id(), err)
- return err
- }
- return nil
- })
-
+ _, err := sess.Exec(m.Sql(mg.dialect))
if err != nil {
+ mg.Logger.Error("Executing migration failed", "id", m.Id(), "error", err)
return err
}
diff --git a/pkg/services/sqlstore/migrator/mysql_dialect.go b/pkg/services/sqlstore/migrator/mysql_dialect.go
index 195d52d1934..48c2cd3ea55 100644
--- a/pkg/services/sqlstore/migrator/mysql_dialect.go
+++ b/pkg/services/sqlstore/migrator/mysql_dialect.go
@@ -29,6 +29,13 @@ func (db *Mysql) AutoIncrStr() string {
return "AUTO_INCREMENT"
}
+func (db *Mysql) BooleanStr(value bool) string {
+ if value {
+ return "1"
+ }
+ return "0"
+}
+
func (db *Mysql) SqlType(c *Column) string {
var res string
switch c.Type {
diff --git a/pkg/services/sqlstore/migrator/postgres_dialect.go b/pkg/services/sqlstore/migrator/postgres_dialect.go
index 826a00a1410..5500b9f1684 100644
--- a/pkg/services/sqlstore/migrator/postgres_dialect.go
+++ b/pkg/services/sqlstore/migrator/postgres_dialect.go
@@ -36,6 +36,10 @@ func (db *Postgres) AutoIncrStr() string {
return ""
}
+func (db *Postgres) BooleanStr(value bool) string {
+ return strconv.FormatBool(value)
+}
+
func (b *Postgres) Default(col *Column) string {
if col.Type == DB_Bool {
if col.Default == "0" {
diff --git a/pkg/services/sqlstore/migrator/sqlite_dialect.go b/pkg/services/sqlstore/migrator/sqlite_dialect.go
index 8555754ab92..fe1e781c8df 100644
--- a/pkg/services/sqlstore/migrator/sqlite_dialect.go
+++ b/pkg/services/sqlstore/migrator/sqlite_dialect.go
@@ -29,6 +29,13 @@ func (db *Sqlite3) AutoIncrStr() string {
return "AUTOINCREMENT"
}
+func (db *Sqlite3) BooleanStr(value bool) string {
+ if value {
+ return "1"
+ }
+ return "0"
+}
+
func (db *Sqlite3) SqlType(c *Column) string {
switch c.Type {
case DB_Date, DB_DateTime, DB_TimeStamp, DB_Time:
diff --git a/pkg/services/sqlstore/org.go b/pkg/services/sqlstore/org.go
index 6ac171127c9..919bb6fd026 100644
--- a/pkg/services/sqlstore/org.go
+++ b/pkg/services/sqlstore/org.go
@@ -133,10 +133,16 @@ func UpdateOrg(cmd *m.UpdateOrgCommand) error {
Updated: time.Now(),
}
- if _, err := sess.Id(cmd.OrgId).Update(&org); err != nil {
+ affectedRows, err := sess.Id(cmd.OrgId).Update(&org)
+
+ if err != nil {
return err
}
+ if affectedRows == 0 {
+ return m.ErrOrgNotFound
+ }
+
sess.publishAfterCommit(&events.OrgUpdated{
Timestamp: org.Updated,
Id: org.Id,
@@ -176,6 +182,11 @@ func UpdateOrgAddress(cmd *m.UpdateOrgAddressCommand) error {
func DeleteOrg(cmd *m.DeleteOrgCommand) error {
return inTransaction2(func(sess *session) error {
+ if res, err := sess.Query("SELECT 1 from org WHERE id=?", cmd.Id); err != nil {
+ return err
+ } else if len(res) != 1 {
+ return m.ErrOrgNotFound
+ }
deletes := []string{
"DELETE FROM star WHERE EXISTS (SELECT 1 FROM dashboard WHERE org_id = ? AND star.dashboard_id = dashboard.id)",
diff --git a/pkg/services/sqlstore/org_users.go b/pkg/services/sqlstore/org_users.go
index fdd671d0bfe..11ea558b0ce 100644
--- a/pkg/services/sqlstore/org_users.go
+++ b/pkg/services/sqlstore/org_users.go
@@ -26,6 +26,12 @@ func AddOrgUser(cmd *m.AddOrgUserCommand) error {
return m.ErrOrgUserAlreadyAdded
}
+ if res, err := sess.Query("SELECT 1 from org WHERE id=?", cmd.OrgId); err != nil {
+ return err
+ } else if len(res) != 1 {
+ return m.ErrOrgNotFound
+ }
+
entity := m.OrgUser{
OrgId: cmd.OrgId,
UserId: cmd.UserId,
diff --git a/pkg/services/sqlstore/plugin_setting.go b/pkg/services/sqlstore/plugin_setting.go
index b3285e905cf..8121b8c7b4b 100644
--- a/pkg/services/sqlstore/plugin_setting.go
+++ b/pkg/services/sqlstore/plugin_setting.go
@@ -13,14 +13,20 @@ func init() {
bus.AddHandler("sql", GetPluginSettings)
bus.AddHandler("sql", GetPluginSettingById)
bus.AddHandler("sql", UpdatePluginSetting)
+ bus.AddHandler("sql", UpdatePluginSettingVersion)
}
func GetPluginSettings(query *m.GetPluginSettingsQuery) error {
- sql := `SELECT org_id, plugin_id, enabled, pinned
- FROM plugin_setting
- WHERE org_id=?`
+ sql := `SELECT org_id, plugin_id, enabled, pinned, plugin_version
+ FROM plugin_setting `
+ params := make([]interface{}, 0)
- sess := x.Sql(sql, query.OrgId)
+ if query.OrgId != 0 {
+ sql += "WHERE org_id=?"
+ params = append(params, query.OrgId)
+ }
+
+ sess := x.Sql(sql, params...)
query.Result = make([]*m.PluginSettingInfoDTO, 0)
return sess.Find(&query.Result)
}
@@ -51,23 +57,52 @@ func UpdatePluginSetting(cmd *m.UpdatePluginSettingCmd) error {
Enabled: cmd.Enabled,
Pinned: cmd.Pinned,
JsonData: cmd.JsonData,
+ PluginVersion: cmd.PluginVersion,
SecureJsonData: cmd.GetEncryptedJsonData(),
Created: time.Now(),
Updated: time.Now(),
}
+
+ // add state change event on commit success
+ sess.events = append(sess.events, &m.PluginStateChangedEvent{
+ PluginId: cmd.PluginId,
+ OrgId: cmd.OrgId,
+ Enabled: cmd.Enabled,
+ })
+
_, err = sess.Insert(&pluginSetting)
return err
} else {
for key, data := range cmd.SecureJsonData {
pluginSetting.SecureJsonData[key] = util.Encrypt([]byte(data), setting.SecretKey)
}
- pluginSetting.SecureJsonData = cmd.GetEncryptedJsonData()
+
+ // add state change event on commit success
+ if pluginSetting.Enabled != cmd.Enabled {
+ sess.events = append(sess.events, &m.PluginStateChangedEvent{
+ PluginId: cmd.PluginId,
+ OrgId: cmd.OrgId,
+ Enabled: cmd.Enabled,
+ })
+ }
+
pluginSetting.Updated = time.Now()
pluginSetting.Enabled = cmd.Enabled
pluginSetting.JsonData = cmd.JsonData
pluginSetting.Pinned = cmd.Pinned
+ pluginSetting.PluginVersion = cmd.PluginVersion
+
_, err = sess.Id(pluginSetting.Id).Update(&pluginSetting)
return err
}
})
}
+
+func UpdatePluginSettingVersion(cmd *m.UpdatePluginSettingVersionCmd) error {
+ return inTransaction2(func(sess *session) error {
+
+ _, err := sess.Exec("UPDATE plugin_setting SET plugin_version=? WHERE org_id=? AND plugin_id=?", cmd.PluginVersion, cmd.OrgId, cmd.PluginId)
+ return err
+
+ })
+}
diff --git a/pkg/services/sqlstore/preferences.go b/pkg/services/sqlstore/preferences.go
new file mode 100644
index 00000000000..65609a9c57c
--- /dev/null
+++ b/pkg/services/sqlstore/preferences.go
@@ -0,0 +1,98 @@
+package sqlstore
+
+import (
+ "time"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+func init() {
+ bus.AddHandler("sql", GetPreferences)
+ bus.AddHandler("sql", GetPreferencesWithDefaults)
+ bus.AddHandler("sql", SavePreferences)
+}
+
+func GetPreferencesWithDefaults(query *m.GetPreferencesWithDefaultsQuery) error {
+
+ prefs := make([]*m.Preferences, 0)
+ filter := "(org_id=? AND user_id=?) OR (org_id=? AND user_id=0)"
+ err := x.Where(filter, query.OrgId, query.UserId, query.OrgId).
+ OrderBy("user_id ASC").
+ Find(&prefs)
+
+ if err != nil {
+ return err
+ }
+
+ res := &m.Preferences{
+ Theme: setting.DefaultTheme,
+ Timezone: "browser",
+ HomeDashboardId: 0,
+ }
+
+ for _, p := range prefs {
+ if p.Theme != "" {
+ res.Theme = p.Theme
+ }
+ if p.Timezone != "" {
+ res.Timezone = p.Timezone
+ }
+ if p.HomeDashboardId != 0 {
+ res.HomeDashboardId = p.HomeDashboardId
+ }
+ }
+
+ query.Result = res
+ return nil
+}
+
+func GetPreferences(query *m.GetPreferencesQuery) error {
+
+ var prefs m.Preferences
+ exists, err := x.Where("org_id=? AND user_id=?", query.OrgId, query.UserId).Get(&prefs)
+
+ if err != nil {
+ return err
+ }
+
+ if exists {
+ query.Result = &prefs
+ } else {
+ query.Result = new(m.Preferences)
+ }
+
+ return nil
+}
+
+func SavePreferences(cmd *m.SavePreferencesCommand) error {
+ return inTransaction2(func(sess *session) error {
+
+ var prefs m.Preferences
+ exists, err := sess.Where("org_id=? AND user_id=?", cmd.OrgId, cmd.UserId).Get(&prefs)
+
+ if !exists {
+ prefs = m.Preferences{
+ UserId: cmd.UserId,
+ OrgId: cmd.OrgId,
+ HomeDashboardId: cmd.HomeDashboardId,
+ Timezone: cmd.Timezone,
+ Theme: cmd.Theme,
+ Created: time.Now(),
+ Updated: time.Now(),
+ }
+ _, err = sess.Insert(&prefs)
+ return err
+ } else {
+ prefs.HomeDashboardId = cmd.HomeDashboardId
+ prefs.Timezone = cmd.Timezone
+ prefs.Theme = cmd.Theme
+ prefs.Updated = time.Now()
+ prefs.Version += 1
+ _, err := sess.Id(prefs.Id).AllCols().Update(&prefs)
+ return err
+ }
+ })
+}
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index 8dae7247a39..5c44fe85f50 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -2,6 +2,7 @@ package sqlstore
import (
"fmt"
+ "net/url"
"os"
"path"
"path/filepath"
@@ -10,6 +11,7 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/annotations"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"github.com/grafana/grafana/pkg/setting"
@@ -21,12 +23,12 @@ import (
_ "github.com/mattn/go-sqlite3"
)
-type MySQLConfig struct {
- SslMode string
- CaCertPath string
- ClientKeyPath string
- ClientCertPath string
- ServerCertName string
+type DatabaseConfig struct {
+ Type, Host, Name, User, Pwd, Path, SslMode string
+ CaCertPath string
+ ClientKeyPath string
+ ClientCertPath string
+ ServerCertName string
}
var (
@@ -35,13 +37,10 @@ var (
HasEngine bool
- DbCfg struct {
- Type, Host, Name, User, Pwd, Path, SslMode string
- }
-
- mysqlConfig MySQLConfig
+ DbCfg DatabaseConfig
UseSQLite3 bool
+ sqlog log.Logger = log.New("sqlstore")
)
func EnsureAdminUser() {
@@ -74,38 +73,30 @@ func NewEngine() {
x, err := getEngine()
if err != nil {
- log.Fatal(3, "Sqlstore: Fail to connect to database: %v", err)
+ sqlog.Crit("Fail to connect to database", "error", err)
+ os.Exit(1)
}
- err = SetEngine(x, setting.Env == setting.DEV)
+ err = SetEngine(x)
if err != nil {
- log.Fatal(3, "fail to initialize orm engine: %v", err)
+ sqlog.Error("Fail to initialize orm engine", "error", err)
+ os.Exit(1)
}
}
-func SetEngine(engine *xorm.Engine, enableLog bool) (err error) {
+func SetEngine(engine *xorm.Engine) (err error) {
x = engine
dialect = migrator.NewDialect(x.DriverName())
migrator := migrator.NewMigrator(x)
- migrator.LogLevel = log.INFO
migrations.AddMigrations(migrator)
if err := migrator.Start(); err != nil {
return fmt.Errorf("Sqlstore::Migration failed err: %v\n", err)
}
- if enableLog {
- logPath := path.Join(setting.LogsPath, "xorm.log")
- os.MkdirAll(path.Dir(logPath), os.ModePerm)
-
- f, err := os.Create(logPath)
- if err != nil {
- return fmt.Errorf("sqlstore.init(fail to create xorm.log): %v", err)
- }
- x.Logger = xorm.NewSimpleLogger(f)
- }
+ annotations.SetRepository(&SqlAnnotationRepo{})
return nil
}
@@ -124,8 +115,8 @@ func getEngine() (*xorm.Engine, error) {
cnnstr = fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8",
DbCfg.User, DbCfg.Pwd, protocol, DbCfg.Host, DbCfg.Name)
- if mysqlConfig.SslMode == "true" || mysqlConfig.SslMode == "skip-verify" {
- tlsCert, err := makeCert("custom", mysqlConfig)
+ if DbCfg.SslMode == "true" || DbCfg.SslMode == "skip-verify" {
+ tlsCert, err := makeCert("custom", DbCfg)
if err != nil {
return nil, err
}
@@ -147,7 +138,7 @@ func getEngine() (*xorm.Engine, error) {
if DbCfg.User == "" {
DbCfg.User = "''"
}
- cnnstr = fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=%s", DbCfg.User, DbCfg.Pwd, host, port, DbCfg.Name, DbCfg.SslMode)
+ cnnstr = fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=%s sslcert=%s sslkey=%s sslrootcert=%s", DbCfg.User, DbCfg.Pwd, host, port, DbCfg.Name, DbCfg.SslMode, DbCfg.ClientCertPath, DbCfg.ClientKeyPath, DbCfg.CaCertPath)
case "sqlite3":
if !filepath.IsAbs(DbCfg.Path) {
DbCfg.Path = filepath.Join(setting.DataPath, DbCfg.Path)
@@ -158,32 +149,46 @@ func getEngine() (*xorm.Engine, error) {
return nil, fmt.Errorf("Unknown database type: %s", DbCfg.Type)
}
- log.Info("Database: %v", DbCfg.Type)
-
+ sqlog.Info("Initializing DB", "dbtype", DbCfg.Type)
return xorm.NewEngine(DbCfg.Type, cnnstr)
}
func LoadConfig() {
sec := setting.Cfg.Section("database")
- DbCfg.Type = sec.Key("type").String()
+ cfgURL := sec.Key("url").String()
+ if len(cfgURL) != 0 {
+ dbURL, _ := url.Parse(cfgURL)
+ DbCfg.Type = dbURL.Scheme
+ DbCfg.Host = dbURL.Host
+
+ pathSplit := strings.Split(dbURL.Path, "/")
+ if len(pathSplit) > 1 {
+ DbCfg.Name = pathSplit[1]
+ }
+
+ userInfo := dbURL.User
+ if userInfo != nil {
+ DbCfg.User = userInfo.Username()
+ DbCfg.Pwd, _ = userInfo.Password()
+ }
+ } else {
+ DbCfg.Type = sec.Key("type").String()
+ DbCfg.Host = sec.Key("host").String()
+ DbCfg.Name = sec.Key("name").String()
+ DbCfg.User = sec.Key("user").String()
+ if len(DbCfg.Pwd) == 0 {
+ DbCfg.Pwd = sec.Key("password").String()
+ }
+ }
+
if DbCfg.Type == "sqlite3" {
UseSQLite3 = true
}
- DbCfg.Host = sec.Key("host").String()
- DbCfg.Name = sec.Key("name").String()
- DbCfg.User = sec.Key("user").String()
- if len(DbCfg.Pwd) == 0 {
- DbCfg.Pwd = sec.Key("password").String()
- }
DbCfg.SslMode = sec.Key("ssl_mode").String()
+ DbCfg.CaCertPath = sec.Key("ca_cert_path").String()
+ DbCfg.ClientKeyPath = sec.Key("client_key_path").String()
+ DbCfg.ClientCertPath = sec.Key("client_cert_path").String()
+ DbCfg.ServerCertName = sec.Key("server_cert_name").String()
DbCfg.Path = sec.Key("path").MustString("data/grafana.db")
-
- if DbCfg.Type == "mysql" {
- mysqlConfig.SslMode = DbCfg.SslMode
- mysqlConfig.CaCertPath = sec.Key("ca_cert_path").String()
- mysqlConfig.ClientKeyPath = sec.Key("client_key_path").String()
- mysqlConfig.ClientCertPath = sec.Key("client_cert_path").String()
- mysqlConfig.ServerCertName = sec.Key("server_cert_name").String()
- }
}
diff --git a/pkg/services/sqlstore/stats.go b/pkg/services/sqlstore/stats.go
index 92efab2015d..dd1a8111332 100644
--- a/pkg/services/sqlstore/stats.go
+++ b/pkg/services/sqlstore/stats.go
@@ -39,7 +39,11 @@ func GetSystemStats(query *m.GetSystemStatsQuery) error {
(
SELECT COUNT(*)
FROM ` + dialect.Quote("playlist") + `
- ) AS playlist_count
+ ) AS playlist_count,
+ (
+ SELECT COUNT(*)
+ FROM ` + dialect.Quote("alert") + `
+ ) AS alert_count
`
var stats m.SystemStats
@@ -88,9 +92,8 @@ func GetAdminStats(query *m.GetAdminStatsQuery) error {
) AS starred_db_count,
(
SELECT COUNT(*)
- FROM ` + dialect.Quote("user") + `
- WHERE ` + dialect.Quote("is_admin") + ` = 1
- ) AS grafana_admin_count
+ FROM ` + dialect.Quote("alert") + `
+ ) AS alert_count
`
var stats m.AdminStats
diff --git a/pkg/services/sqlstore/tls_mysql.go b/pkg/services/sqlstore/tls_mysql.go
index fb55eb401c9..3c9475e19a0 100644
--- a/pkg/services/sqlstore/tls_mysql.go
+++ b/pkg/services/sqlstore/tls_mysql.go
@@ -7,7 +7,7 @@ import (
"io/ioutil"
)
-func makeCert(tlsPoolName string, config MySQLConfig) (*tls.Config, error) {
+func makeCert(tlsPoolName string, config DatabaseConfig) (*tls.Config, error) {
rootCertPool := x509.NewCertPool()
pem, err := ioutil.ReadFile(config.CaCertPath)
if err != nil {
diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index 96b8c24b8fc..b26a9153f55 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -19,6 +19,7 @@ func init() {
bus.AddHandler("sql", UpdateUser)
bus.AddHandler("sql", ChangeUserPassword)
bus.AddHandler("sql", GetUserByLogin)
+ bus.AddHandler("sql", GetUserByEmail)
bus.AddHandler("sql", SetUsingOrg)
bus.AddHandler("sql", GetUserProfile)
bus.AddHandler("sql", GetSignedInUser)
@@ -27,6 +28,7 @@ func init() {
bus.AddHandler("sql", DeleteUser)
bus.AddHandler("sql", SetUsingOrg)
bus.AddHandler("sql", UpdateUserPermissions)
+ bus.AddHandler("sql", SetUserHelpFlag)
}
func getOrgIdForNewUser(cmd *m.CreateUserCommand, sess *session) (int64, error) {
@@ -128,7 +130,11 @@ func CreateUser(cmd *m.CreateUserCommand) error {
}
if setting.AutoAssignOrg && !user.IsAdmin {
- orgUser.Role = m.RoleType(setting.AutoAssignOrgRole)
+ if len(cmd.DefaultOrgRole) > 0 {
+ orgUser.Role = m.RoleType(cmd.DefaultOrgRole)
+ } else {
+ orgUser.Role = m.RoleType(setting.AutoAssignOrgRole)
+ }
}
if _, err = sess.Insert(&orgUser); err != nil {
@@ -161,12 +167,42 @@ func GetUserByLogin(query *m.GetUserByLoginQuery) error {
}
user := new(m.User)
- if strings.Contains(query.LoginOrEmail, "@") {
- user = &m.User{Email: query.LoginOrEmail}
- } else {
- user = &m.User{Login: query.LoginOrEmail}
+
+ // Try and find the user by login first.
+ // It's not sufficient to assume that a LoginOrEmail with an "@" is an email.
+ user = &m.User{Login: query.LoginOrEmail}
+ has, err := x.Get(user)
+
+ if err != nil {
+ return err
}
+ if has == false && strings.Contains(query.LoginOrEmail, "@") {
+ // If the user wasn't found, and it contains an "@" fallback to finding the
+ // user by email.
+ user = &m.User{Email: query.LoginOrEmail}
+ has, err = x.Get(user)
+ }
+
+ if err != nil {
+ return err
+ } else if has == false {
+ return m.ErrUserNotFound
+ }
+
+ query.Result = user
+
+ return nil
+}
+
+func GetUserByEmail(query *m.GetUserByEmailQuery) error {
+ if query.Email == "" {
+ return m.ErrUserNotFound
+ }
+
+ user := new(m.User)
+
+ user = &m.User{Email: query.Email}
has, err := x.Get(user)
if err != nil {
@@ -273,7 +309,7 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error {
u.email as email,
u.login as login,
u.name as name,
- u.theme as theme,
+ u.help_flags1 as help_flags1,
org.name as org_name,
org_user.role as org_role,
org.id as org_id
@@ -346,3 +382,20 @@ func UpdateUserPermissions(cmd *m.UpdateUserPermissionsCommand) error {
return err
})
}
+
+func SetUserHelpFlag(cmd *m.SetUserHelpFlagCommand) error {
+ return inTransaction2(func(sess *session) error {
+
+ user := m.User{
+ Id: cmd.UserId,
+ HelpFlags1: cmd.HelpFlags1,
+ Updated: time.Now(),
+ }
+
+ if _, err := sess.Id(cmd.UserId).Cols("help_flags1").Update(&user); err != nil {
+ return err
+ }
+
+ return nil
+ })
+}
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index b8e8d7f7fcf..0de7b87b164 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -5,7 +5,6 @@ package setting
import (
"bytes"
- "encoding/json"
"fmt"
"net/url"
"os"
@@ -25,8 +24,9 @@ import (
type Scheme string
const (
- HTTP Scheme = "http"
- HTTPS Scheme = "https"
+ HTTP Scheme = "http"
+ HTTPS Scheme = "https"
+ DEFAULT_HTTP_ADDR string = "0.0.0.0"
)
const (
@@ -37,9 +37,10 @@ const (
var (
// App settings.
- Env string = DEV
- AppUrl string
- AppSubUrl string
+ Env string = DEV
+ AppUrl string
+ AppSubUrl string
+ InstanceName string
// build
BuildVersion string
@@ -47,10 +48,11 @@ var (
BuildStamp int64
// Paths
- LogsPath string
- HomePath string
- DataPath string
- PluginsPath string
+ LogsPath string
+ HomePath string
+ DataPath string
+ PluginsPath string
+ CustomInitPath = "conf/custom.ini"
// Log settings.
LogModes []string
@@ -77,9 +79,11 @@ var (
DataProxyWhiteList map[string]bool
// Snapshots
- ExternalSnapshotUrl string
- ExternalSnapshotName string
- ExternalEnabled bool
+ ExternalSnapshotUrl string
+ ExternalSnapshotName string
+ ExternalEnabled bool
+ SnapShotTTLDays int
+ SnapShotRemoveExpired bool
// User settings
AllowUserSignUp bool
@@ -88,6 +92,8 @@ var (
AutoAssignOrgRole string
VerifyEmailEnabled bool
LoginHint string
+ DefaultTheme string
+ DisableLoginForm bool
// Http auth
AdminUser string
@@ -102,6 +108,8 @@ var (
AuthProxyHeaderName string
AuthProxyHeaderProperty string
AuthProxyAutoSignUp bool
+ AuthProxyLdapSyncTtl int
+ AuthProxyWhitelist string
// Basic Auth
BasicAuthEnabled bool
@@ -124,18 +132,36 @@ var (
appliedEnvOverrides []string
ReportingEnabled bool
+ CheckForUpdates bool
GoogleAnalyticsId string
GoogleTagManagerId string
// LDAP
- LdapEnabled bool
- LdapConfigFile string
+ LdapEnabled bool
+ LdapConfigFile string
+ LdapAllowSignup bool = true
// SMTP email settings
Smtp SmtpSettings
// QUOTA
Quota QuotaSettings
+
+ // Alerting
+ ExecuteAlerts bool
+
+ // logger
+ logger log.Logger
+
+ // Grafana.NET URL
+ GrafanaNetUrl string
+
+ // S3 temp image store
+ S3TempImageStoreBucketUrl string
+ S3TempImageStoreAccessKey string
+ S3TempImageStoreSecretKey string
+
+ ImageUploadProvider string
)
type CommandLineArgs struct {
@@ -146,7 +172,7 @@ type CommandLineArgs struct {
func init() {
IsWindows = runtime.GOOS == "windows"
- log.NewLogger(0, "console", `{"level": 0, "formatting":true}`)
+ logger = log.New("settings")
}
func parseAppUrlAndSubUrl(section *ini.Section) (string, string) {
@@ -171,7 +197,12 @@ func ToAbsUrl(relativeUrl string) string {
func shouldRedactKey(s string) bool {
uppercased := strings.ToUpper(s)
- return strings.Contains(uppercased, "PASSWORD") || strings.Contains(uppercased, "SECRET")
+ return strings.Contains(uppercased, "PASSWORD") || strings.Contains(uppercased, "SECRET") || strings.Contains(uppercased, "PROVIDER_CONFIG")
+}
+
+func shouldRedactURLKey(s string) bool {
+ uppercased := strings.ToUpper(s)
+ return strings.Contains(uppercased, "DATABASE_URL")
}
func applyEnvVariableOverrides() {
@@ -188,6 +219,17 @@ func applyEnvVariableOverrides() {
if shouldRedactKey(envKey) {
envValue = "*********"
}
+ if shouldRedactURLKey(envKey) {
+ u, _ := url.Parse(envValue)
+ ui := u.User
+ if ui != nil {
+ _, exists := ui.Password()
+ if exists {
+ u.User = url.UserPassword(ui.Username(), "-redacted-")
+ envValue = u.String()
+ }
+ }
+ }
appliedEnvOverrides = append(appliedEnvOverrides, fmt.Sprintf("%s=%s", envKey, envValue))
}
}
@@ -257,6 +299,12 @@ func evalEnvVarExpression(value string) string {
envVar = strings.TrimPrefix(envVar, "${")
envVar = strings.TrimSuffix(envVar, "}")
envValue := os.Getenv(envVar)
+
+ // if env variable is hostname and it is emtpy use os.Hostname as default
+ if envVar == "HOSTNAME" && envValue == "" {
+ envValue, _ = os.Hostname()
+ }
+
return envValue
})
}
@@ -269,21 +317,22 @@ func evalConfigValues() {
}
}
-func loadSpecifedConfigFile(configFile string) {
+func loadSpecifedConfigFile(configFile string) error {
if configFile == "" {
- configFile = filepath.Join(HomePath, "conf/custom.ini")
+ configFile = filepath.Join(HomePath, CustomInitPath)
// return without error if custom file does not exist
if !pathExists(configFile) {
- return
+ return nil
}
}
userConfig, err := ini.Load(configFile)
- userConfig.BlockMode = false
if err != nil {
- log.Fatal(3, "Failed to parse %v, %v", configFile, err)
+ return fmt.Errorf("Failed to parse %v, %v", configFile, err)
}
+ userConfig.BlockMode = false
+
for _, section := range userConfig.Sections() {
for _, key := range section.Keys() {
if key.Value() == "" {
@@ -303,6 +352,7 @@ func loadSpecifedConfigFile(configFile string) {
}
configFiles = append(configFiles, configFile)
+ return nil
}
func loadConfiguration(args *CommandLineArgs) {
@@ -312,24 +362,33 @@ func loadConfiguration(args *CommandLineArgs) {
defaultConfigFile := path.Join(HomePath, "conf/defaults.ini")
configFiles = append(configFiles, defaultConfigFile)
- Cfg, err = ini.Load(defaultConfigFile)
- Cfg.BlockMode = false
-
- if err != nil {
- log.Fatal(3, "Failed to parse defaults.ini, %v", err)
+ // check if config file exists
+ if _, err := os.Stat(defaultConfigFile); os.IsNotExist(err) {
+ fmt.Println("Grafana-server Init Failed: Could not find config defaults, make sure homepath command line parameter is set or working directory is homepath")
+ os.Exit(1)
}
+ // load defaults
+ Cfg, err = ini.Load(defaultConfigFile)
+ if err != nil {
+ fmt.Println(fmt.Sprintf("Failed to parse defaults.ini, %v", err))
+ os.Exit(1)
+ return
+ }
+
+ Cfg.BlockMode = false
+
// command line props
commandLineProps := getCommandLineProperties(args.Args)
// load default overrides
applyCommandLineDefaultProperties(commandLineProps)
- // init logging before specific config so we can log errors from here on
- DataPath = makeAbsolute(Cfg.Section("paths").Key("data").String(), HomePath)
- initLogging(args)
-
// load specified config file
- loadSpecifedConfigFile(args.Config)
+ err = loadSpecifedConfigFile(args.Config)
+ if err != nil {
+ initLogging()
+ log.Fatal(3, err.Error())
+ }
// apply environment overrides
applyEnvVariableOverrides()
@@ -342,7 +401,7 @@ func loadConfiguration(args *CommandLineArgs) {
// update data path and logging config
DataPath = makeAbsolute(Cfg.Section("paths").Key("data").String(), HomePath)
- initLogging(args)
+ initLogging()
}
func pathExists(path string) bool {
@@ -393,12 +452,29 @@ func validateStaticRootPath() error {
return fmt.Errorf("Failed to detect generated css or javascript files in static root (%s), have you executed default grunt task?", StaticRootPath)
}
+// func readInstanceName() string {
+// hostname, _ := os.Hostname()
+// if hostname == "" {
+// hostname = "hostname_unknown"
+// }
+//
+// instanceName := Cfg.Section("").Key("instance_name").MustString("")
+// if instanceName = "" {
+// // set value as it might be used in other places
+// Cfg.Section("").Key("instance_name").SetValue(hostname)
+// instanceName = hostname
+// }
+//
+// return
+// }
+
func NewConfigContext(args *CommandLineArgs) error {
setHomePath(args)
loadConfiguration(args)
Env = Cfg.Section("").Key("app_mode").MustString("development")
- PluginsPath = Cfg.Section("paths").Key("plugins").String()
+ InstanceName = Cfg.Section("").Key("instance_name").MustString("unknown_instance_name")
+ PluginsPath = makeAbsolute(Cfg.Section("paths").Key("plugins").String(), HomePath)
server := Cfg.Section("server")
AppUrl, AppSubUrl = parseAppUrlAndSubUrl(server)
@@ -411,7 +487,7 @@ func NewConfigContext(args *CommandLineArgs) error {
}
Domain = server.Key("domain").MustString("localhost")
- HttpAddr = server.Key("http_addr").MustString("0.0.0.0")
+ HttpAddr = server.Key("http_addr").MustString(DEFAULT_HTTP_ADDR)
HttpPort = server.Key("http_port").MustString("3000")
RouterLogging = server.Key("router_logging").MustBool(false)
EnableGzip = server.Key("enable_gzip").MustBool(false)
@@ -435,6 +511,8 @@ func NewConfigContext(args *CommandLineArgs) error {
ExternalSnapshotUrl = snapshots.Key("external_snapshot_url").String()
ExternalSnapshotName = snapshots.Key("external_snapshot_name").String()
ExternalEnabled = snapshots.Key("external_enabled").MustBool(true)
+ SnapShotRemoveExpired = snapshots.Key("snapshot_remove_expired").MustBool(true)
+ SnapShotTTLDays = snapshots.Key("snapshot_TTL_days").MustInt(90)
// read data source proxy white list
DataProxyWhiteList = make(map[string]bool)
@@ -453,6 +531,11 @@ func NewConfigContext(args *CommandLineArgs) error {
AutoAssignOrgRole = users.Key("auto_assign_org_role").In("Editor", []string{"Editor", "Admin", "Read Only Editor", "Viewer"})
VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false)
LoginHint = users.Key("login_hint").String()
+ DefaultTheme = users.Key("default_theme").String()
+
+ // auth
+ auth := Cfg.Section("auth")
+ DisableLoginForm = auth.Key("disable_login_form").MustBool(false)
// anonymous access
AnonymousEnabled = Cfg.Section("auth.anonymous").Key("enabled").MustBool(false)
@@ -465,7 +548,10 @@ func NewConfigContext(args *CommandLineArgs) error {
AuthProxyHeaderName = authProxy.Key("header_name").String()
AuthProxyHeaderProperty = authProxy.Key("header_property").String()
AuthProxyAutoSignUp = authProxy.Key("auto_sign_up").MustBool(true)
+ AuthProxyLdapSyncTtl = authProxy.Key("ldap_sync_ttl").MustInt()
+ AuthProxyWhitelist = authProxy.Key("whitelist").String()
+ // basic auth
authBasic := Cfg.Section("auth.basic")
BasicAuthEnabled = authBasic.Key("enabled").MustBool(true)
@@ -475,12 +561,17 @@ func NewConfigContext(args *CommandLineArgs) error {
analytics := Cfg.Section("analytics")
ReportingEnabled = analytics.Key("reporting_enabled").MustBool(true)
+ CheckForUpdates = analytics.Key("check_for_updates").MustBool(true)
GoogleAnalyticsId = analytics.Key("google_analytics_ua_id").String()
GoogleTagManagerId = analytics.Key("google_tag_manager_id").String()
ldapSec := Cfg.Section("auth.ldap")
LdapEnabled = ldapSec.Key("enabled").MustBool(false)
LdapConfigFile = ldapSec.Key("config_file").String()
+ LdapAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true)
+
+ alerting := Cfg.Section("alerting")
+ ExecuteAlerts = alerting.Key("execute_alerts").MustBool(true)
readSessionConfig()
readSmtpSettings()
@@ -490,6 +581,10 @@ func NewConfigContext(args *CommandLineArgs) error {
log.Warn("require_email_validation is enabled but smpt is disabled")
}
+ GrafanaNetUrl = Cfg.Section("grafana_net").Key("url").MustString("https://grafana.net")
+
+ imageUploadingSection := Cfg.Section("external_image_storage")
+ ImageUploadProvider = imageUploadingSection.Key("provider").MustString("internal")
return nil
}
@@ -515,124 +610,39 @@ func readSessionConfig() {
}
}
-var logLevels = map[string]int{
- "Trace": 0,
- "Debug": 1,
- "Info": 2,
- "Warn": 3,
- "Error": 4,
- "Critical": 5,
-}
-
-func initLogging(args *CommandLineArgs) {
- //close any existing log handlers.
- log.Close()
- // Get and check log mode.
+func initLogging() {
+ // split on comma
LogModes = strings.Split(Cfg.Section("log").Key("mode").MustString("console"), ",")
- LogsPath = makeAbsolute(Cfg.Section("paths").Key("logs").String(), HomePath)
-
- LogConfigs = make([]util.DynMap, len(LogModes))
- for i, mode := range LogModes {
- mode = strings.TrimSpace(mode)
- sec, err := Cfg.GetSection("log." + mode)
- if err != nil {
- log.Fatal(4, "Unknown log mode: %s", mode)
- }
-
- // Log level.
- levelName := Cfg.Section("log."+mode).Key("level").In("Trace",
- []string{"Trace", "Debug", "Info", "Warn", "Error", "Critical"})
- level, ok := logLevels[levelName]
- if !ok {
- log.Fatal(4, "Unknown log level: %s", levelName)
- }
-
- // Generate log configuration.
- switch mode {
- case "console":
- formatting := sec.Key("formatting").MustBool(true)
- LogConfigs[i] = util.DynMap{
- "level": level,
- "formatting": formatting,
- }
- case "file":
- logPath := sec.Key("file_name").MustString(filepath.Join(LogsPath, "grafana.log"))
- os.MkdirAll(filepath.Dir(logPath), os.ModePerm)
- LogConfigs[i] = util.DynMap{
- "level": level,
- "filename": logPath,
- "rotate": sec.Key("log_rotate").MustBool(true),
- "maxlines": sec.Key("max_lines").MustInt(1000000),
- "maxsize": 1 << uint(sec.Key("max_size_shift").MustInt(28)),
- "daily": sec.Key("daily_rotate").MustBool(true),
- "maxdays": sec.Key("max_days").MustInt(7),
- }
- case "conn":
- LogConfigs[i] = util.DynMap{
- "level": level,
- "reconnectOnMsg": sec.Key("reconnect_on_msg").MustBool(),
- "reconnect": sec.Key("reconnect").MustBool(),
- "net": sec.Key("protocol").In("tcp", []string{"tcp", "unix", "udp"}),
- "addr": sec.Key("addr").MustString(":7020"),
- }
- case "smtp":
- LogConfigs[i] = util.DynMap{
- "level": level,
- "user": sec.Key("user").MustString("example@example.com"),
- "passwd": sec.Key("passwd").MustString("******"),
- "host": sec.Key("host").MustString("127.0.0.1:25"),
- "receivers": sec.Key("receivers").MustString("[]"),
- "subject": sec.Key("subject").MustString("Diagnostic message from serve"),
- }
- case "database":
- LogConfigs[i] = util.DynMap{
- "level": level,
- "driver": sec.Key("driver").String(),
- "conn": sec.Key("conn").String(),
- }
- case "syslog":
- LogConfigs[i] = util.DynMap{
- "level": level,
- "network": sec.Key("network").MustString(""),
- "address": sec.Key("address").MustString(""),
- "facility": sec.Key("facility").MustString("local7"),
- "tag": sec.Key("tag").MustString(""),
- }
- }
-
- cfgJsonBytes, _ := json.Marshal(LogConfigs[i])
- log.NewLogger(Cfg.Section("log").Key("buffer_len").MustInt64(10000), mode, string(cfgJsonBytes))
+ // also try space
+ if len(LogModes) == 1 {
+ LogModes = strings.Split(Cfg.Section("log").Key("mode").MustString("console"), " ")
}
+ LogsPath = makeAbsolute(Cfg.Section("paths").Key("logs").String(), HomePath)
+ log.ReadLoggingConfig(LogModes, LogsPath, Cfg)
}
func LogConfigurationInfo() {
var text bytes.Buffer
- text.WriteString("Configuration Info\n")
- text.WriteString("Config files:\n")
- for i, file := range configFiles {
- text.WriteString(fmt.Sprintf(" [%d]: %s\n", i, file))
+ for _, file := range configFiles {
+ logger.Info("Config loaded from", "file", file)
}
if len(appliedCommandLineProperties) > 0 {
- text.WriteString("Command lines overrides:\n")
- for i, prop := range appliedCommandLineProperties {
- text.WriteString(fmt.Sprintf(" [%d]: %s\n", i, prop))
+ for _, prop := range appliedCommandLineProperties {
+ logger.Info("Config overriden from command line", "arg", prop)
}
}
if len(appliedEnvOverrides) > 0 {
text.WriteString("\tEnvironment variables used:\n")
- for i, prop := range appliedEnvOverrides {
- text.WriteString(fmt.Sprintf(" [%d]: %s\n", i, prop))
+ for _, prop := range appliedEnvOverrides {
+ logger.Info("Config overriden from Environment variable", "var", prop)
}
}
- text.WriteString("Paths:\n")
- text.WriteString(fmt.Sprintf(" home: %s\n", HomePath))
- text.WriteString(fmt.Sprintf(" data: %s\n", DataPath))
- text.WriteString(fmt.Sprintf(" logs: %s\n", LogsPath))
- text.WriteString(fmt.Sprintf(" plugins: %s\n", PluginsPath))
-
- log.Info(text.String())
+ logger.Info("Path Home", "path", HomePath)
+ logger.Info("Path Data", "path", DataPath)
+ logger.Info("Path Logs", "path", LogsPath)
+ logger.Info("Path Plugins", "path", PluginsPath)
}
diff --git a/pkg/setting/setting_oauth.go b/pkg/setting/setting_oauth.go
index db2f0fb3802..bc52d2336c3 100644
--- a/pkg/setting/setting_oauth.go
+++ b/pkg/setting/setting_oauth.go
@@ -6,13 +6,17 @@ type OAuthInfo struct {
AuthUrl, TokenUrl string
Enabled bool
AllowedDomains []string
+ HostedDomain string
ApiUrl string
AllowSignup bool
+ Name string
+ TlsClientCert string
+ TlsClientKey string
+ TlsClientCa string
}
type OAuther struct {
- GitHub, Google, Twitter bool
- OAuthInfos map[string]*OAuthInfo
+ OAuthInfos map[string]*OAuthInfo
}
var OAuthService *OAuther
diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go
index ef44f55551c..586cd8ff61d 100644
--- a/pkg/setting/setting_test.go
+++ b/pkg/setting/setting_test.go
@@ -29,6 +29,20 @@ func TestLoadingSettings(t *testing.T) {
So(LogsPath, ShouldEqual, filepath.Join(DataPath, "log"))
})
+ Convey("Should replace password when defined in environment", func() {
+ os.Setenv("GF_SECURITY_ADMIN_PASSWORD", "supersecret")
+ NewConfigContext(&CommandLineArgs{HomePath: "../../"})
+
+ So(appliedEnvOverrides, ShouldContain, "GF_SECURITY_ADMIN_PASSWORD=*********")
+ })
+
+ Convey("Should replace password in URL when url environment is defined", func() {
+ os.Setenv("GF_DATABASE_URL", "mysql://user:secret@localhost:3306/database")
+ NewConfigContext(&CommandLineArgs{HomePath: "../../"})
+
+ So(appliedEnvOverrides, ShouldContain, "GF_DATABASE_URL=mysql://user:-redacted-@localhost:3306/database")
+ })
+
Convey("Should get property map from command line args array", func() {
props := getCommandLineProperties([]string{"cfg:test=value", "cfg:map.test=1"})
@@ -89,5 +103,14 @@ func TestLoadingSettings(t *testing.T) {
So(DataPath, ShouldEqual, "/tmp/env_override")
})
+ Convey("instance_name default to hostname even if hostname env is emtpy", func() {
+ NewConfigContext(&CommandLineArgs{
+ HomePath: "../../",
+ })
+
+ hostname, _ := os.Hostname()
+ So(InstanceName, ShouldEqual, hostname)
+ })
+
})
}
diff --git a/pkg/social/common.go b/pkg/social/common.go
new file mode 100644
index 00000000000..7bce5d2ae8f
--- /dev/null
+++ b/pkg/social/common.go
@@ -0,0 +1,20 @@
+package social
+
+import (
+ "fmt"
+ "strings"
+)
+
+func isEmailAllowed(email string, allowedDomains []string) bool {
+ if len(allowedDomains) == 0 {
+ return true
+ }
+
+ valid := false
+ for _, domain := range allowedDomains {
+ emailSuffix := fmt.Sprintf("@%s", domain)
+ valid = valid || strings.HasSuffix(email, emailSuffix)
+ }
+
+ return valid
+}
diff --git a/pkg/social/generic_oauth.go b/pkg/social/generic_oauth.go
new file mode 100644
index 00000000000..f0e36ac064c
--- /dev/null
+++ b/pkg/social/generic_oauth.go
@@ -0,0 +1,217 @@
+package social
+
+import (
+ "encoding/json"
+ "errors"
+ "fmt"
+ "net/http"
+
+ "github.com/grafana/grafana/pkg/models"
+
+ "golang.org/x/oauth2"
+)
+
+type GenericOAuth struct {
+ *oauth2.Config
+ allowedDomains []string
+ allowedOrganizations []string
+ apiUrl string
+ allowSignup bool
+ teamIds []int
+}
+
+func (s *GenericOAuth) Type() int {
+ return int(models.GENERIC)
+}
+
+func (s *GenericOAuth) IsEmailAllowed(email string) bool {
+ return isEmailAllowed(email, s.allowedDomains)
+}
+
+func (s *GenericOAuth) IsSignupAllowed() bool {
+ return s.allowSignup
+}
+
+func (s *GenericOAuth) IsTeamMember(client *http.Client) bool {
+ if len(s.teamIds) == 0 {
+ return true
+ }
+
+ teamMemberships, err := s.FetchTeamMemberships(client)
+ if err != nil {
+ return false
+ }
+
+ for _, teamId := range s.teamIds {
+ for _, membershipId := range teamMemberships {
+ if teamId == membershipId {
+ return true
+ }
+ }
+ }
+
+ return false
+}
+
+func (s *GenericOAuth) IsOrganizationMember(client *http.Client) bool {
+ if len(s.allowedOrganizations) == 0 {
+ return true
+ }
+
+ organizations, err := s.FetchOrganizations(client)
+ if err != nil {
+ return false
+ }
+
+ for _, allowedOrganization := range s.allowedOrganizations {
+ for _, organization := range organizations {
+ if organization == allowedOrganization {
+ return true
+ }
+ }
+ }
+
+ return false
+}
+
+func (s *GenericOAuth) FetchPrivateEmail(client *http.Client) (string, error) {
+ type Record struct {
+ Email string `json:"email"`
+ Primary bool `json:"primary"`
+ Verified bool `json:"verified"`
+ }
+
+ emailsUrl := fmt.Sprintf(s.apiUrl + "/emails")
+ r, err := client.Get(emailsUrl)
+ if err != nil {
+ return "", err
+ }
+
+ defer r.Body.Close()
+
+ var records []Record
+
+ if err = json.NewDecoder(r.Body).Decode(&records); err != nil {
+ return "", err
+ }
+
+ var email = ""
+ for _, record := range records {
+ if record.Primary {
+ email = record.Email
+ }
+ }
+
+ return email, nil
+}
+
+func (s *GenericOAuth) FetchTeamMemberships(client *http.Client) ([]int, error) {
+ type Record struct {
+ Id int `json:"id"`
+ }
+
+ membershipUrl := fmt.Sprintf(s.apiUrl + "/teams")
+ r, err := client.Get(membershipUrl)
+ if err != nil {
+ return nil, err
+ }
+
+ defer r.Body.Close()
+
+ var records []Record
+
+ if err = json.NewDecoder(r.Body).Decode(&records); err != nil {
+ return nil, err
+ }
+
+ var ids = make([]int, len(records))
+ for i, record := range records {
+ ids[i] = record.Id
+ }
+
+ return ids, nil
+}
+
+func (s *GenericOAuth) FetchOrganizations(client *http.Client) ([]string, error) {
+ type Record struct {
+ Login string `json:"login"`
+ }
+
+ url := fmt.Sprintf(s.apiUrl + "/orgs")
+ r, err := client.Get(url)
+ if err != nil {
+ return nil, err
+ }
+
+ defer r.Body.Close()
+
+ var records []Record
+
+ if err = json.NewDecoder(r.Body).Decode(&records); err != nil {
+ return nil, err
+ }
+
+ var logins = make([]string, len(records))
+ for i, record := range records {
+ logins[i] = record.Login
+ }
+
+ return logins, nil
+}
+
+func (s *GenericOAuth) UserInfo(client *http.Client) (*BasicUserInfo, error) {
+ var data struct {
+ Name string `json:"name"`
+ Login string `json:"login"`
+ Username string `json:"username"`
+ Email string `json:"email"`
+ Attributes map[string][]string `json:"attributes"`
+ }
+
+ var err error
+ r, err := client.Get(s.apiUrl)
+ if err != nil {
+ return nil, err
+ }
+
+ defer r.Body.Close()
+
+ if err = json.NewDecoder(r.Body).Decode(&data); err != nil {
+ return nil, err
+ }
+
+ userInfo := &BasicUserInfo{
+ Name: data.Name,
+ Login: data.Login,
+ Email: data.Email,
+ }
+
+ if userInfo.Email == "" && data.Attributes["email:primary"] != nil {
+ userInfo.Email = data.Attributes["email:primary"][0]
+ }
+
+ if userInfo.Email == "" {
+ userInfo.Email, err = s.FetchPrivateEmail(client)
+ if err != nil {
+ return nil, err
+ }
+ }
+
+ if userInfo.Login == "" && data.Username != "" {
+ userInfo.Login = data.Username
+ }
+
+ if userInfo.Login == "" {
+ userInfo.Login = data.Email
+ }
+
+ if !s.IsTeamMember(client) {
+ return nil, errors.New("User not a member of one of the required teams")
+ }
+
+ if !s.IsOrganizationMember(client) {
+ return nil, errors.New("User not a member of one of the required organizations")
+ }
+
+ return userInfo, nil
+}
diff --git a/pkg/social/github_oauth.go b/pkg/social/github_oauth.go
new file mode 100644
index 00000000000..64ff1d86851
--- /dev/null
+++ b/pkg/social/github_oauth.go
@@ -0,0 +1,211 @@
+package social
+
+import (
+ "encoding/json"
+ "errors"
+ "fmt"
+ "net/http"
+
+ "github.com/grafana/grafana/pkg/models"
+
+ "golang.org/x/oauth2"
+)
+
+type SocialGithub struct {
+ *oauth2.Config
+ allowedDomains []string
+ allowedOrganizations []string
+ apiUrl string
+ allowSignup bool
+ teamIds []int
+}
+
+var (
+ ErrMissingTeamMembership = errors.New("User not a member of one of the required teams")
+)
+
+var (
+ ErrMissingOrganizationMembership = errors.New("User not a member of one of the required organizations")
+)
+
+func (s *SocialGithub) Type() int {
+ return int(models.GITHUB)
+}
+
+func (s *SocialGithub) IsEmailAllowed(email string) bool {
+ return isEmailAllowed(email, s.allowedDomains)
+}
+
+func (s *SocialGithub) IsSignupAllowed() bool {
+ return s.allowSignup
+}
+
+func (s *SocialGithub) IsTeamMember(client *http.Client) bool {
+ if len(s.teamIds) == 0 {
+ return true
+ }
+
+ teamMemberships, err := s.FetchTeamMemberships(client)
+ if err != nil {
+ return false
+ }
+
+ for _, teamId := range s.teamIds {
+ for _, membershipId := range teamMemberships {
+ if teamId == membershipId {
+ return true
+ }
+ }
+ }
+
+ return false
+}
+
+func (s *SocialGithub) IsOrganizationMember(client *http.Client) bool {
+ if len(s.allowedOrganizations) == 0 {
+ return true
+ }
+
+ organizations, err := s.FetchOrganizations(client)
+ if err != nil {
+ return false
+ }
+
+ for _, allowedOrganization := range s.allowedOrganizations {
+ for _, organization := range organizations {
+ if organization == allowedOrganization {
+ return true
+ }
+ }
+ }
+
+ return false
+}
+
+func (s *SocialGithub) FetchPrivateEmail(client *http.Client) (string, error) {
+ type Record struct {
+ Email string `json:"email"`
+ Primary bool `json:"primary"`
+ Verified bool `json:"verified"`
+ }
+
+ emailsUrl := fmt.Sprintf(s.apiUrl + "/emails")
+ r, err := client.Get(emailsUrl)
+ if err != nil {
+ return "", err
+ }
+
+ defer r.Body.Close()
+
+ var records []Record
+
+ if err = json.NewDecoder(r.Body).Decode(&records); err != nil {
+ return "", err
+ }
+
+ var email = ""
+ for _, record := range records {
+ if record.Primary {
+ email = record.Email
+ }
+ }
+
+ return email, nil
+}
+
+func (s *SocialGithub) FetchTeamMemberships(client *http.Client) ([]int, error) {
+ type Record struct {
+ Id int `json:"id"`
+ }
+
+ membershipUrl := fmt.Sprintf(s.apiUrl + "/teams")
+ r, err := client.Get(membershipUrl)
+ if err != nil {
+ return nil, err
+ }
+
+ defer r.Body.Close()
+
+ var records []Record
+
+ if err = json.NewDecoder(r.Body).Decode(&records); err != nil {
+ return nil, err
+ }
+
+ var ids = make([]int, len(records))
+ for i, record := range records {
+ ids[i] = record.Id
+ }
+
+ return ids, nil
+}
+
+func (s *SocialGithub) FetchOrganizations(client *http.Client) ([]string, error) {
+ type Record struct {
+ Login string `json:"login"`
+ }
+
+ url := fmt.Sprintf(s.apiUrl + "/orgs")
+ r, err := client.Get(url)
+ if err != nil {
+ return nil, err
+ }
+
+ defer r.Body.Close()
+
+ var records []Record
+
+ if err = json.NewDecoder(r.Body).Decode(&records); err != nil {
+ return nil, err
+ }
+
+ var logins = make([]string, len(records))
+ for i, record := range records {
+ logins[i] = record.Login
+ }
+
+ return logins, nil
+}
+
+func (s *SocialGithub) UserInfo(client *http.Client) (*BasicUserInfo, error) {
+ var data struct {
+ Id int `json:"id"`
+ Login string `json:"login"`
+ Email string `json:"email"`
+ }
+
+ var err error
+ r, err := client.Get(s.apiUrl)
+ if err != nil {
+ return nil, err
+ }
+
+ defer r.Body.Close()
+
+ if err = json.NewDecoder(r.Body).Decode(&data); err != nil {
+ return nil, err
+ }
+
+ userInfo := &BasicUserInfo{
+ Name: data.Login,
+ Login: data.Login,
+ Email: data.Email,
+ }
+
+ if !s.IsTeamMember(client) {
+ return nil, ErrMissingTeamMembership
+ }
+
+ if !s.IsOrganizationMember(client) {
+ return nil, ErrMissingOrganizationMembership
+ }
+
+ if userInfo.Email == "" {
+ userInfo.Email, err = s.FetchPrivateEmail(client)
+ if err != nil {
+ return nil, err
+ }
+ }
+
+ return userInfo, nil
+}
diff --git a/pkg/social/google_oauth.go b/pkg/social/google_oauth.go
new file mode 100644
index 00000000000..d140f385b66
--- /dev/null
+++ b/pkg/social/google_oauth.go
@@ -0,0 +1,52 @@
+package social
+
+import (
+ "encoding/json"
+ "net/http"
+
+ "github.com/grafana/grafana/pkg/models"
+
+ "golang.org/x/oauth2"
+)
+
+type SocialGoogle struct {
+ *oauth2.Config
+ allowedDomains []string
+ hostedDomain string
+ apiUrl string
+ allowSignup bool
+}
+
+func (s *SocialGoogle) Type() int {
+ return int(models.GOOGLE)
+}
+
+func (s *SocialGoogle) IsEmailAllowed(email string) bool {
+ return isEmailAllowed(email, s.allowedDomains)
+}
+
+func (s *SocialGoogle) IsSignupAllowed() bool {
+ return s.allowSignup
+}
+
+func (s *SocialGoogle) UserInfo(client *http.Client) (*BasicUserInfo, error) {
+ var data struct {
+ Name string `json:"name"`
+ Email string `json:"email"`
+ }
+ var err error
+
+ r, err := client.Get(s.apiUrl)
+ if err != nil {
+ return nil, err
+ }
+ defer r.Body.Close()
+ if err = json.NewDecoder(r.Body).Decode(&data); err != nil {
+ return nil, err
+ }
+ return &BasicUserInfo{
+ Name: data.Name,
+ Email: data.Email,
+ Login: data.Email,
+ }, nil
+}
diff --git a/pkg/social/grafananet_oauth.go b/pkg/social/grafananet_oauth.go
new file mode 100644
index 00000000000..83c6d147b70
--- /dev/null
+++ b/pkg/social/grafananet_oauth.go
@@ -0,0 +1,84 @@
+package social
+
+import (
+ "encoding/json"
+ "net/http"
+
+ "github.com/grafana/grafana/pkg/models"
+
+ "golang.org/x/oauth2"
+)
+
+type SocialGrafanaNet struct {
+ *oauth2.Config
+ url string
+ allowedOrganizations []string
+ allowSignup bool
+}
+
+type OrgRecord struct {
+ Login string `json:"login"`
+}
+
+func (s *SocialGrafanaNet) Type() int {
+ return int(models.GRAFANANET)
+}
+
+func (s *SocialGrafanaNet) IsEmailAllowed(email string) bool {
+ return true
+}
+
+func (s *SocialGrafanaNet) IsSignupAllowed() bool {
+ return s.allowSignup
+}
+
+func (s *SocialGrafanaNet) IsOrganizationMember(organizations []OrgRecord) bool {
+ if len(s.allowedOrganizations) == 0 {
+ return true
+ }
+
+ for _, allowedOrganization := range s.allowedOrganizations {
+ for _, organization := range organizations {
+ if organization.Login == allowedOrganization {
+ return true
+ }
+ }
+ }
+
+ return false
+}
+
+func (s *SocialGrafanaNet) UserInfo(client *http.Client) (*BasicUserInfo, error) {
+ var data struct {
+ Name string `json:"name"`
+ Login string `json:"username"`
+ Email string `json:"email"`
+ Role string `json:"role"`
+ Orgs []OrgRecord `json:"orgs"`
+ }
+
+ var err error
+ r, err := client.Get(s.url + "/api/oauth2/user")
+ if err != nil {
+ return nil, err
+ }
+
+ defer r.Body.Close()
+
+ if err = json.NewDecoder(r.Body).Decode(&data); err != nil {
+ return nil, err
+ }
+
+ userInfo := &BasicUserInfo{
+ Name: data.Name,
+ Login: data.Login,
+ Email: data.Email,
+ Role: data.Role,
+ }
+
+ if !s.IsOrganizationMember(data.Orgs) {
+ return nil, ErrMissingOrganizationMembership
+ }
+
+ return userInfo, nil
+}
diff --git a/pkg/social/social.go b/pkg/social/social.go
index 4a8cb8bac5d..860d068957e 100644
--- a/pkg/social/social.go
+++ b/pkg/social/social.go
@@ -1,36 +1,32 @@
package social
import (
- "encoding/json"
- "errors"
- "fmt"
"net/http"
- "strconv"
"strings"
- "github.com/grafana/grafana/pkg/models"
- "github.com/grafana/grafana/pkg/setting"
"golang.org/x/net/context"
-
"golang.org/x/oauth2"
+
+ "github.com/grafana/grafana/pkg/setting"
)
type BasicUserInfo struct {
- Identity string
- Name string
- Email string
- Login string
- Company string
+ Name string
+ Email string
+ Login string
+ Company string
+ Role string
}
type SocialConnector interface {
Type() int
- UserInfo(token *oauth2.Token) (*BasicUserInfo, error)
+ UserInfo(client *http.Client) (*BasicUserInfo, error)
IsEmailAllowed(email string) bool
IsSignupAllowed() bool
AuthCodeURL(state string, opts ...oauth2.AuthCodeOption) string
Exchange(ctx context.Context, code string) (*oauth2.Token, error)
+ Client(ctx context.Context, t *oauth2.Token) *http.Client
}
var (
@@ -42,7 +38,7 @@ func NewOAuthService() {
setting.OAuthService = &setting.OAuther{}
setting.OAuthService.OAuthInfos = make(map[string]*setting.OAuthInfo)
- allOauthes := []string{"github", "google"}
+ allOauthes := []string{"github", "google", "generic_oauth", "grafananet"}
for _, name := range allOauthes {
sec := setting.Cfg.Section("auth." + name)
@@ -55,7 +51,12 @@ func NewOAuthService() {
ApiUrl: sec.Key("api_url").String(),
Enabled: sec.Key("enabled").MustBool(),
AllowedDomains: sec.Key("allowed_domains").Strings(" "),
+ HostedDomain: sec.Key("hosted_domain").String(),
AllowSignup: sec.Key("allow_sign_up").MustBool(),
+ Name: sec.Key("name").MustString(name),
+ TlsClientCert: sec.Key("tls_client_cert").String(),
+ TlsClientKey: sec.Key("tls_client_key").String(),
+ TlsClientCa: sec.Key("tls_client_ca").String(),
}
if !info.Enabled {
@@ -63,6 +64,7 @@ func NewOAuthService() {
}
setting.OAuthService.OAuthInfos[name] = info
+
config := oauth2.Config{
ClientID: info.ClientId,
ClientSecret: info.ClientSecret,
@@ -76,291 +78,57 @@ func NewOAuthService() {
// GitHub.
if name == "github" {
- setting.OAuthService.GitHub = true
- teamIds := sec.Key("team_ids").Ints(",")
- allowedOrganizations := sec.Key("allowed_organizations").Strings(" ")
SocialMap["github"] = &SocialGithub{
Config: &config,
allowedDomains: info.AllowedDomains,
apiUrl: info.ApiUrl,
allowSignup: info.AllowSignup,
- teamIds: teamIds,
- allowedOrganizations: allowedOrganizations,
+ teamIds: sec.Key("team_ids").Ints(","),
+ allowedOrganizations: sec.Key("allowed_organizations").Strings(" "),
}
}
// Google.
if name == "google" {
- setting.OAuthService.Google = true
SocialMap["google"] = &SocialGoogle{
- Config: &config, allowedDomains: info.AllowedDomains,
- apiUrl: info.ApiUrl,
- allowSignup: info.AllowSignup,
+ Config: &config,
+ allowedDomains: info.AllowedDomains,
+ hostedDomain: info.HostedDomain,
+ apiUrl: info.ApiUrl,
+ allowSignup: info.AllowSignup,
+ }
+ }
+
+ // Generic - Uses the same scheme as Github.
+ if name == "generic_oauth" {
+ SocialMap["generic_oauth"] = &GenericOAuth{
+ Config: &config,
+ allowedDomains: info.AllowedDomains,
+ apiUrl: info.ApiUrl,
+ allowSignup: info.AllowSignup,
+ teamIds: sec.Key("team_ids").Ints(","),
+ allowedOrganizations: sec.Key("allowed_organizations").Strings(" "),
+ }
+ }
+
+ if name == "grafananet" {
+ config = oauth2.Config{
+ ClientID: info.ClientId,
+ ClientSecret: info.ClientSecret,
+ Endpoint: oauth2.Endpoint{
+ AuthURL: setting.GrafanaNetUrl + "/oauth2/authorize",
+ TokenURL: setting.GrafanaNetUrl + "/api/oauth2/token",
+ },
+ RedirectURL: strings.TrimSuffix(setting.AppUrl, "/") + SocialBaseUrl + name,
+ Scopes: info.Scopes,
+ }
+
+ SocialMap["grafananet"] = &SocialGrafanaNet{
+ Config: &config,
+ url: setting.GrafanaNetUrl,
+ allowSignup: info.AllowSignup,
+ allowedOrganizations: sec.Key("allowed_organizations").Strings(" "),
}
}
}
}
-
-func isEmailAllowed(email string, allowedDomains []string) bool {
- if len(allowedDomains) == 0 {
- return true
- }
-
- valid := false
- for _, domain := range allowedDomains {
- emailSuffix := fmt.Sprintf("@%s", domain)
- valid = valid || strings.HasSuffix(email, emailSuffix)
- }
-
- return valid
-}
-
-type SocialGithub struct {
- *oauth2.Config
- allowedDomains []string
- allowedOrganizations []string
- apiUrl string
- allowSignup bool
- teamIds []int
-}
-
-var (
- ErrMissingTeamMembership = errors.New("User not a member of one of the required teams")
-)
-
-var (
- ErrMissingOrganizationMembership = errors.New("User not a member of one of the required organizations")
-)
-
-func (s *SocialGithub) Type() int {
- return int(models.GITHUB)
-}
-
-func (s *SocialGithub) IsEmailAllowed(email string) bool {
- return isEmailAllowed(email, s.allowedDomains)
-}
-
-func (s *SocialGithub) IsSignupAllowed() bool {
- return s.allowSignup
-}
-
-func (s *SocialGithub) IsTeamMember(client *http.Client) bool {
- if len(s.teamIds) == 0 {
- return true
- }
-
- teamMemberships, err := s.FetchTeamMemberships(client)
- if err != nil {
- return false
- }
-
- for _, teamId := range s.teamIds {
- for _, membershipId := range teamMemberships {
- if teamId == membershipId {
- return true
- }
- }
- }
-
- return false
-}
-
-func (s *SocialGithub) IsOrganizationMember(client *http.Client) bool {
- if len(s.allowedOrganizations) == 0 {
- return true
- }
-
- organizations, err := s.FetchOrganizations(client)
- if err != nil {
- return false
- }
-
- for _, allowedOrganization := range s.allowedOrganizations {
- for _, organization := range organizations {
- if organization == allowedOrganization {
- return true
- }
- }
- }
-
- return false
-}
-
-func (s *SocialGithub) FetchPrivateEmail(client *http.Client) (string, error) {
- type Record struct {
- Email string `json:"email"`
- Primary bool `json:"primary"`
- Verified bool `json:"verified"`
- }
-
- emailsUrl := fmt.Sprintf(s.apiUrl + "/emails")
- r, err := client.Get(emailsUrl)
- if err != nil {
- return "", err
- }
-
- defer r.Body.Close()
-
- var records []Record
-
- if err = json.NewDecoder(r.Body).Decode(&records); err != nil {
- return "", err
- }
-
- var email = ""
- for _, record := range records {
- if record.Primary {
- email = record.Email
- }
- }
-
- return email, nil
-}
-
-func (s *SocialGithub) FetchTeamMemberships(client *http.Client) ([]int, error) {
- type Record struct {
- Id int `json:"id"`
- }
-
- membershipUrl := fmt.Sprintf(s.apiUrl + "/teams")
- r, err := client.Get(membershipUrl)
- if err != nil {
- return nil, err
- }
-
- defer r.Body.Close()
-
- var records []Record
-
- if err = json.NewDecoder(r.Body).Decode(&records); err != nil {
- return nil, err
- }
-
- var ids = make([]int, len(records))
- for i, record := range records {
- ids[i] = record.Id
- }
-
- return ids, nil
-}
-
-func (s *SocialGithub) FetchOrganizations(client *http.Client) ([]string, error) {
- type Record struct {
- Login string `json:"login"`
- }
-
- url := fmt.Sprintf(s.apiUrl + "/orgs")
- r, err := client.Get(url)
- if err != nil {
- return nil, err
- }
-
- defer r.Body.Close()
-
- var records []Record
-
- if err = json.NewDecoder(r.Body).Decode(&records); err != nil {
- return nil, err
- }
-
- var logins = make([]string, len(records))
- for i, record := range records {
- logins[i] = record.Login
- }
-
- return logins, nil
-}
-
-func (s *SocialGithub) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) {
- var data struct {
- Id int `json:"id"`
- Name string `json:"login"`
- Email string `json:"email"`
- }
-
- var err error
- client := s.Client(oauth2.NoContext, token)
- r, err := client.Get(s.apiUrl)
- if err != nil {
- return nil, err
- }
-
- defer r.Body.Close()
-
- if err = json.NewDecoder(r.Body).Decode(&data); err != nil {
- return nil, err
- }
-
- userInfo := &BasicUserInfo{
- Identity: strconv.Itoa(data.Id),
- Name: data.Name,
- Email: data.Email,
- }
-
- if !s.IsTeamMember(client) {
- return nil, ErrMissingTeamMembership
- }
-
- if !s.IsOrganizationMember(client) {
- return nil, ErrMissingOrganizationMembership
- }
-
- if userInfo.Email == "" {
- userInfo.Email, err = s.FetchPrivateEmail(client)
- if err != nil {
- return nil, err
- }
- }
-
- return userInfo, nil
-}
-
-// ________ .__
-// / _____/ ____ ____ ____ | | ____
-// / \ ___ / _ \ / _ \ / ___\| | _/ __ \
-// \ \_\ ( <_> | <_> ) /_/ > |_\ ___/
-// \______ /\____/ \____/\___ /|____/\___ >
-// \/ /_____/ \/
-
-type SocialGoogle struct {
- *oauth2.Config
- allowedDomains []string
- apiUrl string
- allowSignup bool
-}
-
-func (s *SocialGoogle) Type() int {
- return int(models.GOOGLE)
-}
-
-func (s *SocialGoogle) IsEmailAllowed(email string) bool {
- return isEmailAllowed(email, s.allowedDomains)
-}
-
-func (s *SocialGoogle) IsSignupAllowed() bool {
- return s.allowSignup
-}
-
-func (s *SocialGoogle) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) {
- var data struct {
- Id string `json:"id"`
- Name string `json:"name"`
- Email string `json:"email"`
- }
- var err error
-
- client := s.Client(oauth2.NoContext, token)
- r, err := client.Get(s.apiUrl)
- if err != nil {
- return nil, err
- }
- defer r.Body.Close()
- if err = json.NewDecoder(r.Body).Decode(&data); err != nil {
- return nil, err
- }
- return &BasicUserInfo{
- Identity: data.Id,
- Name: data.Name,
- Email: data.Email,
- }, nil
-}
diff --git a/pkg/tsdb/batch.go b/pkg/tsdb/batch.go
new file mode 100644
index 00000000000..8130ac94b0d
--- /dev/null
+++ b/pkg/tsdb/batch.go
@@ -0,0 +1,90 @@
+package tsdb
+
+import "context"
+
+type Batch struct {
+ DataSourceId int64
+ Queries QuerySlice
+ Depends map[string]bool
+ Done bool
+ Started bool
+}
+
+type BatchSlice []*Batch
+
+func newBatch(dsId int64, queries QuerySlice) *Batch {
+ return &Batch{
+ DataSourceId: dsId,
+ Queries: queries,
+ Depends: make(map[string]bool),
+ }
+}
+
+func (bg *Batch) process(ctx context.Context, queryContext *QueryContext) {
+ executor, err := getExecutorFor(bg.Queries[0].DataSource)
+
+ if err != nil {
+ bg.Done = true
+ result := &BatchResult{
+ Error: err,
+ QueryResults: make(map[string]*QueryResult),
+ }
+ for _, query := range bg.Queries {
+ result.QueryResults[query.RefId] = &QueryResult{Error: result.Error}
+ }
+ queryContext.ResultsChan <- result
+ return
+ }
+
+ res := executor.Execute(ctx, bg.Queries, queryContext)
+ bg.Done = true
+ queryContext.ResultsChan <- res
+}
+
+func (bg *Batch) addQuery(query *Query) {
+ bg.Queries = append(bg.Queries, query)
+}
+
+func (bg *Batch) allDependenciesAreIn(context *QueryContext) bool {
+ for key := range bg.Depends {
+ if _, exists := context.Results[key]; !exists {
+ return false
+ }
+ }
+
+ return true
+}
+
+func getBatches(req *Request) (BatchSlice, error) {
+ batches := make(BatchSlice, 0)
+
+ for _, query := range req.Queries {
+ if foundBatch := findMatchingBatchGroup(query, batches); foundBatch != nil {
+ foundBatch.addQuery(query)
+ } else {
+ newBatch := newBatch(query.DataSource.Id, QuerySlice{query})
+ batches = append(batches, newBatch)
+
+ for _, refId := range query.Depends {
+ for _, batch := range batches {
+ for _, batchQuery := range batch.Queries {
+ if batchQuery.RefId == refId {
+ newBatch.Depends[refId] = true
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return batches, nil
+}
+
+func findMatchingBatchGroup(query *Query, batches BatchSlice) *Batch {
+ for _, batch := range batches {
+ if batch.DataSourceId == query.DataSource.Id {
+ return batch
+ }
+ }
+ return nil
+}
diff --git a/pkg/tsdb/executor.go b/pkg/tsdb/executor.go
new file mode 100644
index 00000000000..251b3dc947a
--- /dev/null
+++ b/pkg/tsdb/executor.go
@@ -0,0 +1,36 @@
+package tsdb
+
+import (
+ "context"
+ "fmt"
+
+ "github.com/grafana/grafana/pkg/models"
+)
+
+type Executor interface {
+ Execute(ctx context.Context, queries QuerySlice, query *QueryContext) *BatchResult
+}
+
+var registry map[string]GetExecutorFn
+
+type GetExecutorFn func(dsInfo *models.DataSource) (Executor, error)
+
+func init() {
+ registry = make(map[string]GetExecutorFn)
+}
+
+func getExecutorFor(dsInfo *models.DataSource) (Executor, error) {
+ if fn, exists := registry[dsInfo.Type]; exists {
+ executor, err := fn(dsInfo)
+ if err != nil {
+ return nil, err
+ }
+
+ return executor, nil
+ }
+ return nil, fmt.Errorf("Could not find executor for data source type: %s", dsInfo.Type)
+}
+
+func RegisterExecutor(pluginId string, fn GetExecutorFn) {
+ registry[pluginId] = fn
+}
diff --git a/pkg/tsdb/fake_test.go b/pkg/tsdb/fake_test.go
new file mode 100644
index 00000000000..3c773971240
--- /dev/null
+++ b/pkg/tsdb/fake_test.go
@@ -0,0 +1,45 @@
+package tsdb
+
+import (
+ "context"
+
+ "github.com/grafana/grafana/pkg/models"
+)
+
+type FakeExecutor struct {
+ results map[string]*QueryResult
+ resultsFn map[string]ResultsFn
+}
+
+type ResultsFn func(context *QueryContext) *QueryResult
+
+func NewFakeExecutor(dsInfo *models.DataSource) (*FakeExecutor, error) {
+ return &FakeExecutor{
+ results: make(map[string]*QueryResult),
+ resultsFn: make(map[string]ResultsFn),
+ }, nil
+}
+
+func (e *FakeExecutor) Execute(ctx context.Context, queries QuerySlice, context *QueryContext) *BatchResult {
+ result := &BatchResult{QueryResults: make(map[string]*QueryResult)}
+ for _, query := range queries {
+ if results, has := e.results[query.RefId]; has {
+ result.QueryResults[query.RefId] = results
+ }
+ if testFunc, has := e.resultsFn[query.RefId]; has {
+ result.QueryResults[query.RefId] = testFunc(context)
+ }
+ }
+
+ return result
+}
+
+func (e *FakeExecutor) Return(refId string, series TimeSeriesSlice) {
+ e.results[refId] = &QueryResult{
+ RefId: refId, Series: series,
+ }
+}
+
+func (e *FakeExecutor) HandleQuery(refId string, fn ResultsFn) {
+ e.resultsFn[refId] = fn
+}
diff --git a/pkg/tsdb/graphite/graphite.go b/pkg/tsdb/graphite/graphite.go
new file mode 100644
index 00000000000..a467e839b82
--- /dev/null
+++ b/pkg/tsdb/graphite/graphite.go
@@ -0,0 +1,166 @@
+package graphite
+
+import (
+ "context"
+ "encoding/json"
+ "fmt"
+ "io/ioutil"
+ "net/http"
+ "net/url"
+ "path"
+ "regexp"
+ "strings"
+
+ "golang.org/x/net/context/ctxhttp"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+ "github.com/grafana/grafana/pkg/tsdb"
+)
+
+type GraphiteExecutor struct {
+ *models.DataSource
+ HttpClient *http.Client
+}
+
+func NewGraphiteExecutor(datasource *models.DataSource) (tsdb.Executor, error) {
+ httpClient, err := datasource.GetHttpClient()
+
+ if err != nil {
+ return nil, err
+ }
+
+ return &GraphiteExecutor{
+ DataSource: datasource,
+ HttpClient: httpClient,
+ }, nil
+}
+
+var (
+ glog log.Logger
+)
+
+func init() {
+ glog = log.New("tsdb.graphite")
+ tsdb.RegisterExecutor("graphite", NewGraphiteExecutor)
+}
+
+func (e *GraphiteExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, context *tsdb.QueryContext) *tsdb.BatchResult {
+ result := &tsdb.BatchResult{}
+
+ formData := url.Values{
+ "from": []string{"-" + formatTimeRange(context.TimeRange.From)},
+ "until": []string{formatTimeRange(context.TimeRange.To)},
+ "format": []string{"json"},
+ "maxDataPoints": []string{"500"},
+ }
+
+ for _, query := range queries {
+ if fullTarget, err := query.Model.Get("targetFull").String(); err == nil {
+ formData["target"] = []string{fixIntervalFormat(fullTarget)}
+ } else {
+ formData["target"] = []string{fixIntervalFormat(query.Model.Get("target").MustString())}
+ }
+ }
+
+ if setting.Env == setting.DEV {
+ glog.Debug("Graphite request", "params", formData)
+ }
+
+ req, err := e.createRequest(formData)
+ if err != nil {
+ result.Error = err
+ return result
+ }
+
+ res, err := ctxhttp.Do(ctx, e.HttpClient, req)
+ if err != nil {
+ result.Error = err
+ return result
+ }
+
+ data, err := e.parseResponse(res)
+ if err != nil {
+ result.Error = err
+ return result
+ }
+
+ result.QueryResults = make(map[string]*tsdb.QueryResult)
+ queryRes := tsdb.NewQueryResult()
+
+ for _, series := range data {
+ queryRes.Series = append(queryRes.Series, &tsdb.TimeSeries{
+ Name: series.Target,
+ Points: series.DataPoints,
+ })
+
+ if setting.Env == setting.DEV {
+ glog.Debug("Graphite response", "target", series.Target, "datapoints", len(series.DataPoints))
+ }
+ }
+
+ result.QueryResults["A"] = queryRes
+ return result
+}
+
+func (e *GraphiteExecutor) parseResponse(res *http.Response) ([]TargetResponseDTO, error) {
+ body, err := ioutil.ReadAll(res.Body)
+ defer res.Body.Close()
+ if err != nil {
+ return nil, err
+ }
+
+ if res.StatusCode/100 != 2 {
+ glog.Info("Request failed", "status", res.Status, "body", string(body))
+ return nil, fmt.Errorf("Request failed status: %v", res.Status)
+ }
+
+ var data []TargetResponseDTO
+ err = json.Unmarshal(body, &data)
+ if err != nil {
+ glog.Info("Failed to unmarshal graphite response", "error", err, "status", res.Status, "body", string(body))
+ return nil, err
+ }
+
+ return data, nil
+}
+
+func (e *GraphiteExecutor) createRequest(data url.Values) (*http.Request, error) {
+ u, _ := url.Parse(e.Url)
+ u.Path = path.Join(u.Path, "render")
+
+ req, err := http.NewRequest(http.MethodPost, u.String(), strings.NewReader(data.Encode()))
+ if err != nil {
+ glog.Info("Failed to create request", "error", err)
+ return nil, fmt.Errorf("Failed to create request. error: %v", err)
+ }
+
+ req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+ if e.BasicAuth {
+ req.SetBasicAuth(e.BasicAuthUser, e.BasicAuthPassword)
+ }
+
+ return req, err
+}
+
+func formatTimeRange(input string) string {
+ if input == "now" {
+ return input
+ }
+ return strings.Replace(strings.Replace(input, "m", "min", -1), "M", "mon", -1)
+}
+
+func fixIntervalFormat(target string) string {
+ rMinute := regexp.MustCompile(`'(\d+)m'`)
+ rMin := regexp.MustCompile("m")
+ target = rMinute.ReplaceAllStringFunc(target, func(m string) string {
+ return rMin.ReplaceAllString(m, "min")
+ })
+ rMonth := regexp.MustCompile(`'(\d+)M'`)
+ rMon := regexp.MustCompile("M")
+ target = rMonth.ReplaceAllStringFunc(target, func(M string) string {
+ return rMon.ReplaceAllString(M, "mon")
+ })
+ return target
+}
diff --git a/pkg/tsdb/graphite/graphite_test.go b/pkg/tsdb/graphite/graphite_test.go
new file mode 100644
index 00000000000..c1a2736293b
--- /dev/null
+++ b/pkg/tsdb/graphite/graphite_test.go
@@ -0,0 +1,61 @@
+package graphite
+
+import (
+ . "github.com/smartystreets/goconvey/convey"
+ "testing"
+)
+
+func TestGraphiteFunctions(t *testing.T) {
+ Convey("Testing Graphite Functions", t, func() {
+
+ Convey("formatting time range for now", func() {
+
+ timeRange := formatTimeRange("now")
+ So(timeRange, ShouldEqual, "now")
+
+ })
+
+ Convey("formatting time range for now-1m", func() {
+
+ timeRange := formatTimeRange("now-1m")
+ So(timeRange, ShouldEqual, "now-1min")
+
+ })
+
+ Convey("formatting time range for now-1M", func() {
+
+ timeRange := formatTimeRange("now-1M")
+ So(timeRange, ShouldEqual, "now-1mon")
+
+ })
+
+ Convey("fix interval format in query for 1m", func() {
+
+ timeRange := fixIntervalFormat("aliasByNode(hitcount(averageSeries(app.grafana.*.dashboards.views.count), '1m'), 4)")
+ So(timeRange, ShouldEqual, "aliasByNode(hitcount(averageSeries(app.grafana.*.dashboards.views.count), '1min'), 4)")
+
+ })
+
+ Convey("fix interval format in query for 1M", func() {
+
+ timeRange := fixIntervalFormat("aliasByNode(hitcount(averageSeries(app.grafana.*.dashboards.views.count), '1M'), 4)")
+ So(timeRange, ShouldEqual, "aliasByNode(hitcount(averageSeries(app.grafana.*.dashboards.views.count), '1mon'), 4)")
+
+ })
+
+ Convey("should not override query for 1M", func() {
+
+ timeRange := fixIntervalFormat("app.grafana.*.dashboards.views.1M.count")
+ So(timeRange, ShouldEqual, "app.grafana.*.dashboards.views.1M.count")
+
+ })
+
+ Convey("should not override query for 1m", func() {
+
+ timeRange := fixIntervalFormat("app.grafana.*.dashboards.views.1m.count")
+ So(timeRange, ShouldEqual, "app.grafana.*.dashboards.views.1m.count")
+
+ })
+
+ })
+}
diff --git a/pkg/tsdb/graphite/types.go b/pkg/tsdb/graphite/types.go
new file mode 100644
index 00000000000..8bd13aec4f2
--- /dev/null
+++ b/pkg/tsdb/graphite/types.go
@@ -0,0 +1,8 @@
+package graphite
+
+import "github.com/grafana/grafana/pkg/tsdb"
+
+type TargetResponseDTO struct {
+ Target string `json:"target"`
+ DataPoints tsdb.TimeSeriesPoints `json:"datapoints"`
+}
diff --git a/pkg/tsdb/influxdb/influxdb.go b/pkg/tsdb/influxdb/influxdb.go
new file mode 100644
index 00000000000..21d359d24bf
--- /dev/null
+++ b/pkg/tsdb/influxdb/influxdb.go
@@ -0,0 +1,142 @@
+package influxdb
+
+import (
+ "context"
+ "encoding/json"
+ "fmt"
+ "net/http"
+ "net/url"
+ "path"
+
+ "golang.org/x/net/context/ctxhttp"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+ "github.com/grafana/grafana/pkg/tsdb"
+)
+
+type InfluxDBExecutor struct {
+ *models.DataSource
+ QueryParser *InfluxdbQueryParser
+ ResponseParser *ResponseParser
+ HttpClient *http.Client
+}
+
+func NewInfluxDBExecutor(datasource *models.DataSource) (tsdb.Executor, error) {
+ httpClient, err := datasource.GetHttpClient()
+
+ if err != nil {
+ return nil, err
+ }
+
+ return &InfluxDBExecutor{
+ DataSource: datasource,
+ QueryParser: &InfluxdbQueryParser{},
+ ResponseParser: &ResponseParser{},
+ HttpClient: httpClient,
+ }, nil
+}
+
+var (
+ glog log.Logger
+)
+
+func init() {
+ glog = log.New("tsdb.influxdb")
+ tsdb.RegisterExecutor("influxdb", NewInfluxDBExecutor)
+}
+
+func (e *InfluxDBExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, context *tsdb.QueryContext) *tsdb.BatchResult {
+ result := &tsdb.BatchResult{}
+
+ query, err := e.getQuery(queries, context)
+ if err != nil {
+ return result.WithError(err)
+ }
+
+ rawQuery, err := query.Build(context)
+ if err != nil {
+ return result.WithError(err)
+ }
+
+ if setting.Env == setting.DEV {
+ glog.Debug("Influxdb query", "raw query", rawQuery)
+ }
+
+ req, err := e.createRequest(rawQuery)
+ if err != nil {
+ return result.WithError(err)
+ }
+
+ resp, err := ctxhttp.Do(ctx, e.HttpClient, req)
+ if err != nil {
+ return result.WithError(err)
+ }
+
+ if resp.StatusCode/100 != 2 {
+ return result.WithError(fmt.Errorf("Influxdb returned statuscode invalid status code: %v", resp.Status))
+ }
+
+ var response Response
+ dec := json.NewDecoder(resp.Body)
+ defer resp.Body.Close()
+ dec.UseNumber()
+ err = dec.Decode(&response)
+
+ if err != nil {
+ return result.WithError(err)
+ }
+
+ if response.Err != nil {
+ return result.WithError(response.Err)
+ }
+
+ result.QueryResults = make(map[string]*tsdb.QueryResult)
+ result.QueryResults["A"] = e.ResponseParser.Parse(&response, query)
+
+ return result
+}
+
+func (e *InfluxDBExecutor) getQuery(queries tsdb.QuerySlice, context *tsdb.QueryContext) (*Query, error) {
+ for _, v := range queries {
+
+ query, err := e.QueryParser.Parse(v.Model, e.DataSource)
+ if err != nil {
+ return nil, err
+ }
+
+ return query, nil
+ }
+
+ return nil, fmt.Errorf("query request contains no queries")
+}
+
+func (e *InfluxDBExecutor) createRequest(query string) (*http.Request, error) {
+ u, _ := url.Parse(e.Url)
+ u.Path = path.Join(u.Path, "query")
+
+ req, err := http.NewRequest(http.MethodGet, u.String(), nil)
+ if err != nil {
+ return nil, err
+ }
+
+ params := req.URL.Query()
+ params.Set("q", query)
+ params.Set("db", e.Database)
+ params.Set("epoch", "s")
+ req.URL.RawQuery = params.Encode()
+
+ req.Header.Set("User-Agent", "Grafana")
+
+ if e.BasicAuth {
+ req.SetBasicAuth(e.BasicAuthUser, e.BasicAuthPassword)
+ }
+
+ if !e.BasicAuth && e.User != "" {
+ req.SetBasicAuth(e.User, e.Password)
+ }
+
+ glog.Debug("Influxdb request", "url", req.URL.String())
+ return req, nil
+}
diff --git a/pkg/tsdb/influxdb/model_parser.go b/pkg/tsdb/influxdb/model_parser.go
new file mode 100644
index 00000000000..f3d87739e5b
--- /dev/null
+++ b/pkg/tsdb/influxdb/model_parser.go
@@ -0,0 +1,166 @@
+package influxdb
+
+import (
+ "strconv"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/models"
+)
+
+type InfluxdbQueryParser struct{}
+
+func (qp *InfluxdbQueryParser) Parse(model *simplejson.Json, dsInfo *models.DataSource) (*Query, error) {
+ policy := model.Get("policy").MustString("default")
+ rawQuery := model.Get("query").MustString("")
+ useRawQuery := model.Get("rawQuery").MustBool(false)
+ alias := model.Get("alias").MustString("")
+
+ measurement := model.Get("measurement").MustString("")
+
+ resultFormat, err := model.Get("resultFormat").String()
+ if err != nil {
+ return nil, err
+ }
+
+ tags, err := qp.parseTags(model)
+ if err != nil {
+ return nil, err
+ }
+
+ groupBys, err := qp.parseGroupBy(model)
+ if err != nil {
+ return nil, err
+ }
+
+ selects, err := qp.parseSelects(model)
+ if err != nil {
+ return nil, err
+ }
+
+ interval := model.Get("interval").MustString("")
+ if interval == "" && dsInfo.JsonData != nil {
+ dsInterval := dsInfo.JsonData.Get("timeInterval").MustString("")
+ if dsInterval != "" {
+ interval = dsInterval
+ }
+ }
+
+ return &Query{
+ Measurement: measurement,
+ Policy: policy,
+ ResultFormat: resultFormat,
+ GroupBy: groupBys,
+ Tags: tags,
+ Selects: selects,
+ RawQuery: rawQuery,
+ Interval: interval,
+ Alias: alias,
+ UseRawQuery: useRawQuery,
+ }, nil
+}
+
+func (qp *InfluxdbQueryParser) parseSelects(model *simplejson.Json) ([]*Select, error) {
+ var result []*Select
+
+ for _, selectObj := range model.Get("select").MustArray() {
+ selectJson := simplejson.NewFromAny(selectObj)
+ var parts Select
+
+ for _, partObj := range selectJson.MustArray() {
+ part := simplejson.NewFromAny(partObj)
+ queryPart, err := qp.parseQueryPart(part)
+ if err != nil {
+ return nil, err
+ }
+
+ parts = append(parts, *queryPart)
+ }
+
+ result = append(result, &parts)
+ }
+
+ return result, nil
+}
+
+func (*InfluxdbQueryParser) parseTags(model *simplejson.Json) ([]*Tag, error) {
+ var result []*Tag
+ for _, t := range model.Get("tags").MustArray() {
+ tagJson := simplejson.NewFromAny(t)
+ tag := &Tag{}
+ var err error
+
+ tag.Key, err = tagJson.Get("key").String()
+ if err != nil {
+ return nil, err
+ }
+
+ tag.Value, err = tagJson.Get("value").String()
+ if err != nil {
+ return nil, err
+ }
+
+ operator, err := tagJson.Get("operator").String()
+ if err == nil {
+ tag.Operator = operator
+ }
+
+ condition, err := tagJson.Get("condition").String()
+ if err == nil {
+ tag.Condition = condition
+ }
+
+ result = append(result, tag)
+ }
+
+ return result, nil
+}
+
+func (*InfluxdbQueryParser) parseQueryPart(model *simplejson.Json) (*QueryPart, error) {
+ typ, err := model.Get("type").String()
+ if err != nil {
+ return nil, err
+ }
+
+ var params []string
+ for _, paramObj := range model.Get("params").MustArray() {
+ param := simplejson.NewFromAny(paramObj)
+
+ stringParam, err := param.String()
+ if err == nil {
+ params = append(params, stringParam)
+ continue
+ }
+
+ intParam, err := param.Int()
+ if err == nil {
+ params = append(params, strconv.Itoa(intParam))
+ continue
+ }
+
+ return nil, err
+
+ }
+
+ qp, err := NewQueryPart(typ, params)
+ if err != nil {
+ return nil, err
+ }
+
+ return qp, nil
+}
+
+func (qp *InfluxdbQueryParser) parseGroupBy(model *simplejson.Json) ([]*QueryPart, error) {
+ var result []*QueryPart
+
+ for _, groupObj := range model.Get("groupBy").MustArray() {
+ groupJson := simplejson.NewFromAny(groupObj)
+ queryPart, err := qp.parseQueryPart(groupJson)
+
+ if err != nil {
+ return nil, err
+ }
+ result = append(result, queryPart)
+ }
+
+ return result, nil
+}
diff --git a/pkg/tsdb/influxdb/model_parser_test.go b/pkg/tsdb/influxdb/model_parser_test.go
new file mode 100644
index 00000000000..f7049efb9a7
--- /dev/null
+++ b/pkg/tsdb/influxdb/model_parser_test.go
@@ -0,0 +1,180 @@
+package influxdb
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestInfluxdbQueryParser(t *testing.T) {
+ Convey("Influxdb query parser", t, func() {
+
+ parser := &InfluxdbQueryParser{}
+ dsInfo := &models.DataSource{
+ JsonData: simplejson.New(),
+ }
+
+ Convey("can parse influxdb json model", func() {
+ json := `
+ {
+ "dsType": "influxdb",
+ "groupBy": [
+ {
+ "params": [
+ "$interval"
+ ],
+ "type": "time"
+ },
+ {
+ "params": [
+ "datacenter"
+ ],
+ "type": "tag"
+ },
+ {
+ "params": [
+ "none"
+ ],
+ "type": "fill"
+ }
+ ],
+ "measurement": "logins.count",
+ "policy": "default",
+ "refId": "B",
+ "resultFormat": "time_series",
+ "select": [
+ [
+ {
+ "type": "field",
+ "params": [
+ "value"
+ ]
+ },
+ {
+ "type": "count",
+ "params": []
+ }
+ ],
+ [
+ {
+ "type": "field",
+ "params": [
+ "value"
+ ]
+ },
+ {
+ "type": "bottom",
+ "params": [
+ 3
+ ]
+ }
+ ],
+ [
+ {
+ "type": "field",
+ "params": [
+ "value"
+ ]
+ },
+ {
+ "type": "mean",
+ "params": []
+ },
+ {
+ "type": "math",
+ "params": [
+ " / 100"
+ ]
+ }
+ ]
+ ],
+ "alias": "serie alias",
+ "tags": [
+ {
+ "key": "datacenter",
+ "operator": "=",
+ "value": "America"
+ },
+ {
+ "condition": "OR",
+ "key": "hostname",
+ "operator": "=",
+ "value": "server1"
+ }
+ ]
+ }
+ `
+ dsInfo.JsonData.Set("timeInterval", ">20s")
+ modelJson, err := simplejson.NewJson([]byte(json))
+ So(err, ShouldBeNil)
+
+ res, err := parser.Parse(modelJson, dsInfo)
+ So(err, ShouldBeNil)
+ So(len(res.GroupBy), ShouldEqual, 3)
+ So(len(res.Selects), ShouldEqual, 3)
+ So(len(res.Tags), ShouldEqual, 2)
+ So(res.Interval, ShouldEqual, ">20s")
+ So(res.Alias, ShouldEqual, "serie alias")
+ })
+
+ Convey("can part raw query json model", func() {
+ json := `
+ {
+ "dsType": "influxdb",
+ "groupBy": [
+ {
+ "params": [
+ "$interval"
+ ],
+ "type": "time"
+ },
+ {
+ "params": [
+ "null"
+ ],
+ "type": "fill"
+ }
+ ],
+ "interval": ">10s",
+ "policy": "default",
+ "query": "RawDummieQuery",
+ "rawQuery": true,
+ "refId": "A",
+ "resultFormat": "time_series",
+ "select": [
+ [
+ {
+ "params": [
+ "value"
+ ],
+ "type": "field"
+ },
+ {
+ "params": [
+
+ ],
+ "type": "mean"
+ }
+ ]
+ ],
+ "tags": [
+
+ ]
+ }
+ `
+
+ modelJson, err := simplejson.NewJson([]byte(json))
+ So(err, ShouldBeNil)
+
+ res, err := parser.Parse(modelJson, dsInfo)
+ So(err, ShouldBeNil)
+ So(res.RawQuery, ShouldEqual, "RawDummieQuery")
+ So(len(res.GroupBy), ShouldEqual, 2)
+ So(len(res.Selects), ShouldEqual, 1)
+ So(len(res.Tags), ShouldEqual, 0)
+ So(res.Interval, ShouldEqual, ">10s")
+ })
+ })
+}
diff --git a/pkg/tsdb/influxdb/models.go b/pkg/tsdb/influxdb/models.go
new file mode 100644
index 00000000000..44e05608290
--- /dev/null
+++ b/pkg/tsdb/influxdb/models.go
@@ -0,0 +1,51 @@
+package influxdb
+
+type Query struct {
+ Measurement string
+ Policy string
+ ResultFormat string
+ Tags []*Tag
+ GroupBy []*QueryPart
+ Selects []*Select
+ RawQuery string
+ UseRawQuery bool
+ Alias string
+
+ Interval string
+}
+
+type Tag struct {
+ Key string
+ Operator string
+ Value string
+ Condition string
+}
+
+type Select []QueryPart
+
+type InfluxDbSelect struct {
+ Type string
+}
+
+type Response struct {
+ Results []Result
+ Err error
+}
+
+type Result struct {
+ Series []Row
+ Messages []*Message
+ Err error
+}
+
+type Message struct {
+ Level string `json:"level,omitempty"`
+ Text string `json:"text,omitempty"`
+}
+
+type Row struct {
+ Name string `json:"name,omitempty"`
+ Tags map[string]string `json:"tags,omitempty"`
+ Columns []string `json:"columns,omitempty"`
+ Values [][]interface{} `json:"values,omitempty"`
+}
diff --git a/pkg/tsdb/influxdb/query.go b/pkg/tsdb/influxdb/query.go
new file mode 100644
index 00000000000..094f98cbe53
--- /dev/null
+++ b/pkg/tsdb/influxdb/query.go
@@ -0,0 +1,148 @@
+package influxdb
+
+import (
+ "fmt"
+ "strings"
+
+ "regexp"
+
+ "github.com/grafana/grafana/pkg/tsdb"
+)
+
+var (
+ regexpOperatorPattern *regexp.Regexp = regexp.MustCompile(`^\/.*\/$`)
+ regexpMeasurementPattern *regexp.Regexp = regexp.MustCompile(`^\/.*\/$`)
+)
+
+func (query *Query) Build(queryContext *tsdb.QueryContext) (string, error) {
+ if query.UseRawQuery && query.RawQuery != "" {
+ q := query.RawQuery
+
+ q = strings.Replace(q, "$timeFilter", query.renderTimeFilter(queryContext), 1)
+ q = strings.Replace(q, "$interval", tsdb.CalculateInterval(queryContext.TimeRange), 1)
+
+ return q, nil
+ }
+
+ res := query.renderSelectors(queryContext)
+ res += query.renderMeasurement()
+ res += query.renderWhereClause()
+ res += query.renderTimeFilter(queryContext)
+ res += query.renderGroupBy(queryContext)
+
+ return res, nil
+}
+
+func (query *Query) renderTags() []string {
+ var res []string
+ for i, tag := range query.Tags {
+ str := ""
+
+ if i > 0 {
+ if tag.Condition == "" {
+ str += "AND"
+ } else {
+ str += tag.Condition
+ }
+ str += " "
+ }
+
+ //If the operator is missing we fall back to sensible defaults
+ if tag.Operator == "" {
+ if regexpOperatorPattern.Match([]byte(tag.Value)) {
+ tag.Operator = "=~"
+ } else {
+ tag.Operator = "="
+ }
+ }
+
+ textValue := ""
+
+ // quote value unless regex or number
+ if tag.Operator == "=~" || tag.Operator == "!~" {
+ textValue = tag.Value
+ } else if tag.Operator == "<" || tag.Operator == ">" {
+ textValue = tag.Value
+ } else {
+ textValue = fmt.Sprintf("'%s'", tag.Value)
+ }
+
+ res = append(res, fmt.Sprintf(`%s"%s" %s %s`, str, tag.Key, tag.Operator, textValue))
+ }
+
+ return res
+}
+
+func (query *Query) renderTimeFilter(queryContext *tsdb.QueryContext) string {
+ from := "now() - " + queryContext.TimeRange.From
+ to := ""
+
+ if queryContext.TimeRange.To != "now" && queryContext.TimeRange.To != "" {
+ to = " and time < now() - " + strings.Replace(queryContext.TimeRange.To, "now-", "", 1)
+ }
+
+ return fmt.Sprintf("time > %s%s", from, to)
+}
+
+func (query *Query) renderSelectors(queryContext *tsdb.QueryContext) string {
+ res := "SELECT "
+
+ var selectors []string
+ for _, sel := range query.Selects {
+
+ stk := ""
+ for _, s := range *sel {
+ stk = s.Render(query, queryContext, stk)
+ }
+ selectors = append(selectors, stk)
+ }
+
+ return res + strings.Join(selectors, ", ")
+}
+
+func (query *Query) renderMeasurement() string {
+ policy := ""
+ if query.Policy == "" || query.Policy == "default" {
+ policy = ""
+ } else {
+ policy = `"` + query.Policy + `".`
+ }
+
+ measurement := query.Measurement
+
+ if !regexpMeasurementPattern.Match([]byte(measurement)) {
+ measurement = fmt.Sprintf(`"%s"`, measurement)
+ }
+
+ return fmt.Sprintf(` FROM %s%s`, policy, measurement)
+}
+
+func (query *Query) renderWhereClause() string {
+ res := " WHERE "
+ conditions := query.renderTags()
+ res += strings.Join(conditions, " ")
+ if len(conditions) > 0 {
+ res += " AND "
+ }
+
+ return res
+}
+
+func (query *Query) renderGroupBy(queryContext *tsdb.QueryContext) string {
+ groupBy := ""
+ for i, group := range query.GroupBy {
+ if i == 0 {
+ groupBy += " GROUP BY"
+ }
+
+ if i > 0 && group.Type != "fill" {
+ groupBy += ", " //fill is so very special. fill is a creep, fill is a weirdo
+ } else {
+ groupBy += " "
+ }
+
+ groupBy += group.Render(query, queryContext, "")
+ }
+
+ return groupBy
+}
diff --git a/pkg/tsdb/influxdb/query_part.go b/pkg/tsdb/influxdb/query_part.go
new file mode 100644
index 00000000000..222e0b054ee
--- /dev/null
+++ b/pkg/tsdb/influxdb/query_part.go
@@ -0,0 +1,166 @@
+package influxdb
+
+import (
+ "fmt"
+ "strings"
+ "time"
+
+ "github.com/grafana/grafana/pkg/tsdb"
+)
+
+var renders map[string]QueryDefinition
+
+type DefinitionParameters struct {
+ Name string
+ Type string
+}
+
+type QueryDefinition struct {
+ Renderer func(query *Query, queryContext *tsdb.QueryContext, part *QueryPart, innerExpr string) string
+ Params []DefinitionParameters
+}
+
+func init() {
+ renders = make(map[string]QueryDefinition)
+
+ renders["field"] = QueryDefinition{Renderer: fieldRenderer}
+
+ renders["spread"] = QueryDefinition{Renderer: functionRenderer}
+ renders["count"] = QueryDefinition{Renderer: functionRenderer}
+ renders["distinct"] = QueryDefinition{Renderer: functionRenderer}
+ renders["integral"] = QueryDefinition{Renderer: functionRenderer}
+ renders["mean"] = QueryDefinition{Renderer: functionRenderer}
+ renders["median"] = QueryDefinition{Renderer: functionRenderer}
+ renders["sum"] = QueryDefinition{Renderer: functionRenderer}
+
+ renders["derivative"] = QueryDefinition{
+ Renderer: functionRenderer,
+ Params: []DefinitionParameters{{Name: "duration", Type: "interval"}},
+ }
+
+ renders["non_negative_derivative"] = QueryDefinition{
+ Renderer: functionRenderer,
+ Params: []DefinitionParameters{{Name: "duration", Type: "interval"}},
+ }
+ renders["difference"] = QueryDefinition{Renderer: functionRenderer}
+ renders["moving_average"] = QueryDefinition{
+ Renderer: functionRenderer,
+ Params: []DefinitionParameters{{Name: "window", Type: "number"}},
+ }
+ renders["stddev"] = QueryDefinition{Renderer: functionRenderer}
+ renders["time"] = QueryDefinition{
+ Renderer: functionRenderer,
+ Params: []DefinitionParameters{{Name: "interval", Type: "time"}},
+ }
+ renders["fill"] = QueryDefinition{
+ Renderer: functionRenderer,
+ Params: []DefinitionParameters{{Name: "fill", Type: "string"}},
+ }
+ renders["elapsed"] = QueryDefinition{
+ Renderer: functionRenderer,
+ Params: []DefinitionParameters{{Name: "duration", Type: "interval"}},
+ }
+ renders["bottom"] = QueryDefinition{
+ Renderer: functionRenderer,
+ Params: []DefinitionParameters{{Name: "count", Type: "int"}},
+ }
+
+ renders["first"] = QueryDefinition{Renderer: functionRenderer}
+ renders["last"] = QueryDefinition{Renderer: functionRenderer}
+ renders["max"] = QueryDefinition{Renderer: functionRenderer}
+ renders["min"] = QueryDefinition{Renderer: functionRenderer}
+ renders["percentile"] = QueryDefinition{
+ Renderer: functionRenderer,
+ Params: []DefinitionParameters{{Name: "nth", Type: "int"}},
+ }
+ renders["top"] = QueryDefinition{
+ Renderer: functionRenderer,
+ Params: []DefinitionParameters{{Name: "count", Type: "int"}},
+ }
+ renders["tag"] = QueryDefinition{
+ Renderer: fieldRenderer,
+ Params: []DefinitionParameters{{Name: "tag", Type: "string"}},
+ }
+
+ renders["math"] = QueryDefinition{Renderer: suffixRenderer}
+ renders["alias"] = QueryDefinition{Renderer: aliasRenderer}
+}
+
+func fieldRenderer(query *Query, queryContext *tsdb.QueryContext, part *QueryPart, innerExpr string) string {
+ if part.Params[0] == "*" {
+ return "*"
+ }
+ return fmt.Sprintf(`"%s"`, part.Params[0])
+}
+
+func getDefinedInterval(query *Query, queryContext *tsdb.QueryContext) string {
+ setInterval := strings.Replace(strings.Replace(query.Interval, "<", "", 1), ">", "", 1)
+ defaultInterval := tsdb.CalculateInterval(queryContext.TimeRange)
+
+ if strings.Contains(query.Interval, ">") {
+ parsedDefaultInterval, err := time.ParseDuration(defaultInterval)
+ parsedSetInterval, err2 := time.ParseDuration(setInterval)
+
+ if err == nil && err2 == nil && parsedDefaultInterval > parsedSetInterval {
+ return defaultInterval
+ }
+ }
+
+ return setInterval
+}
+
+func functionRenderer(query *Query, queryContext *tsdb.QueryContext, part *QueryPart, innerExpr string) string {
+ for i, param := range part.Params {
+ if param == "$interval" || param == "auto" {
+ if query.Interval != "" {
+ part.Params[i] = getDefinedInterval(query, queryContext)
+ } else {
+ part.Params[i] = tsdb.CalculateInterval(queryContext.TimeRange)
+ }
+ }
+ }
+
+ if innerExpr != "" {
+ part.Params = append([]string{innerExpr}, part.Params...)
+ }
+
+ params := strings.Join(part.Params, ", ")
+
+ return fmt.Sprintf("%s(%s)", part.Type, params)
+}
+
+func suffixRenderer(query *Query, queryContext *tsdb.QueryContext, part *QueryPart, innerExpr string) string {
+ return fmt.Sprintf("%s %s", innerExpr, part.Params[0])
+}
+
+func aliasRenderer(query *Query, queryContext *tsdb.QueryContext, part *QueryPart, innerExpr string) string {
+ return fmt.Sprintf(`%s AS "%s"`, innerExpr, part.Params[0])
+}
+
+func (r QueryDefinition) Render(query *Query, queryContext *tsdb.QueryContext, part *QueryPart, innerExpr string) string {
+ return r.Renderer(query, queryContext, part, innerExpr)
+}
+
+func NewQueryPart(typ string, params []string) (*QueryPart, error) {
+ def, exist := renders[typ]
+
+ if !exist {
+ return nil, fmt.Errorf("Missing query definition for %s", typ)
+ }
+
+ return &QueryPart{
+ Type: typ,
+ Params: params,
+ Def: def,
+ }, nil
+}
+
+type QueryPart struct {
+ Def QueryDefinition
+ Type string
+ Params []string
+}
+
+func (qp *QueryPart) Render(query *Query, queryContext *tsdb.QueryContext, expr string) string {
+ return qp.Def.Renderer(query, queryContext, qp, expr)
+}
diff --git a/pkg/tsdb/influxdb/query_part_test.go b/pkg/tsdb/influxdb/query_part_test.go
new file mode 100644
index 00000000000..a083754574a
--- /dev/null
+++ b/pkg/tsdb/influxdb/query_part_test.go
@@ -0,0 +1,101 @@
+package influxdb
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/tsdb"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestInfluxdbQueryPart(t *testing.T) {
+ Convey("Influxdb query parts", t, func() {
+
+ queryContext := &tsdb.QueryContext{TimeRange: tsdb.NewTimeRange("5m", "now")}
+ query := &Query{}
+
+ Convey("render field ", func() {
+ part, err := NewQueryPart("field", []string{"value"})
+ So(err, ShouldBeNil)
+
+ res := part.Render(query, queryContext, "value")
+ So(res, ShouldEqual, `"value"`)
+ })
+
+ Convey("render nested part", func() {
+ part, err := NewQueryPart("derivative", []string{"10s"})
+ So(err, ShouldBeNil)
+
+ res := part.Render(query, queryContext, "mean(value)")
+ So(res, ShouldEqual, "derivative(mean(value), 10s)")
+ })
+
+ Convey("render bottom", func() {
+ part, err := NewQueryPart("bottom", []string{"3"})
+ So(err, ShouldBeNil)
+
+ res := part.Render(query, queryContext, "value")
+ So(res, ShouldEqual, "bottom(value, 3)")
+ })
+
+ Convey("render time with $interval", func() {
+ part, err := NewQueryPart("time", []string{"$interval"})
+ So(err, ShouldBeNil)
+
+ res := part.Render(query, queryContext, "")
+ So(res, ShouldEqual, "time(200ms)")
+ })
+
+ Convey("render time with auto", func() {
+ part, err := NewQueryPart("time", []string{"auto"})
+ So(err, ShouldBeNil)
+
+ res := part.Render(query, queryContext, "")
+ So(res, ShouldEqual, "time(200ms)")
+ })
+
+ Convey("render time interval >10s", func() {
+ part, err := NewQueryPart("time", []string{"$interval"})
+ So(err, ShouldBeNil)
+
+ query.Interval = ">10s"
+
+ res := part.Render(query, queryContext, "")
+ So(res, ShouldEqual, "time(10s)")
+ })
+
+ Convey("render time interval >1s and higher interval calculation", func() {
+ part, err := NewQueryPart("time", []string{"$interval"})
+ queryContext := &tsdb.QueryContext{TimeRange: tsdb.NewTimeRange("1y", "now")}
+ So(err, ShouldBeNil)
+
+ query.Interval = ">1s"
+
+ res := part.Render(query, queryContext, "")
+ So(res, ShouldEqual, "time(168h)")
+ })
+
+ Convey("render spread", func() {
+ part, err := NewQueryPart("spread", []string{})
+ So(err, ShouldBeNil)
+
+ res := part.Render(query, queryContext, "value")
+ So(res, ShouldEqual, `spread(value)`)
+ })
+
+ Convey("render suffix", func() {
+ part, err := NewQueryPart("math", []string{"/ 100"})
+ So(err, ShouldBeNil)
+
+ res := part.Render(query, queryContext, "mean(value)")
+ So(res, ShouldEqual, "mean(value) / 100")
+ })
+
+ Convey("render alias", func() {
+ part, err := NewQueryPart("alias", []string{"test"})
+ So(err, ShouldBeNil)
+
+ res := part.Render(query, queryContext, "mean(value)")
+ So(res, ShouldEqual, `mean(value) AS "test"`)
+ })
+ })
+}
diff --git a/pkg/tsdb/influxdb/query_test.go b/pkg/tsdb/influxdb/query_test.go
new file mode 100644
index 00000000000..b6af67e5e42
--- /dev/null
+++ b/pkg/tsdb/influxdb/query_test.go
@@ -0,0 +1,142 @@
+package influxdb
+
+import (
+ "testing"
+
+ "strings"
+
+ "github.com/grafana/grafana/pkg/tsdb"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestInfluxdbQueryBuilder(t *testing.T) {
+
+ Convey("Influxdb query builder", t, func() {
+
+ qp1, _ := NewQueryPart("field", []string{"value"})
+ qp2, _ := NewQueryPart("mean", []string{})
+
+ groupBy1, _ := NewQueryPart("time", []string{"$interval"})
+ groupBy2, _ := NewQueryPart("tag", []string{"datacenter"})
+ groupBy3, _ := NewQueryPart("fill", []string{"null"})
+
+ tag1 := &Tag{Key: "hostname", Value: "server1", Operator: "="}
+ tag2 := &Tag{Key: "hostname", Value: "server2", Operator: "=", Condition: "OR"}
+
+ queryContext := &tsdb.QueryContext{
+ TimeRange: tsdb.NewTimeRange("5m", "now"),
+ }
+
+ Convey("can build simple query", func() {
+ query := &Query{
+ Selects: []*Select{{*qp1, *qp2}},
+ Measurement: "cpu",
+ Policy: "policy",
+ GroupBy: []*QueryPart{groupBy1, groupBy3},
+ Interval: "10s",
+ }
+
+ rawQuery, err := query.Build(queryContext)
+ So(err, ShouldBeNil)
+ So(rawQuery, ShouldEqual, `SELECT mean("value") FROM "policy"."cpu" WHERE time > now() - 5m GROUP BY time(10s) fill(null)`)
+ })
+
+ Convey("can build query with group bys", func() {
+ query := &Query{
+ Selects: []*Select{{*qp1, *qp2}},
+ Measurement: "cpu",
+ GroupBy: []*QueryPart{groupBy1, groupBy2, groupBy3},
+ Tags: []*Tag{tag1, tag2},
+ Interval: "5s",
+ }
+
+ rawQuery, err := query.Build(queryContext)
+ So(err, ShouldBeNil)
+ So(rawQuery, ShouldEqual, `SELECT mean("value") FROM "cpu" WHERE "hostname" = 'server1' OR "hostname" = 'server2' AND time > now() - 5m GROUP BY time(5s), "datacenter" fill(null)`)
+ })
+
+ Convey("can render time range", func() {
+ query := Query{}
+ Convey("render from: 2h to now-1h", func() {
+ query := Query{}
+ queryContext := &tsdb.QueryContext{TimeRange: tsdb.NewTimeRange("2h", "now-1h")}
+ So(query.renderTimeFilter(queryContext), ShouldEqual, "time > now() - 2h and time < now() - 1h")
+ })
+
+ Convey("render from: 10m", func() {
+ queryContext := &tsdb.QueryContext{TimeRange: tsdb.NewTimeRange("10m", "now")}
+ So(query.renderTimeFilter(queryContext), ShouldEqual, "time > now() - 10m")
+ })
+ })
+
+ Convey("can build query from raw query", func() {
+ query := &Query{
+ Selects: []*Select{{*qp1, *qp2}},
+ Measurement: "cpu",
+ Policy: "policy",
+ GroupBy: []*QueryPart{groupBy1, groupBy3},
+ Interval: "10s",
+ RawQuery: "Raw query",
+ UseRawQuery: true,
+ }
+
+ rawQuery, err := query.Build(queryContext)
+ So(err, ShouldBeNil)
+ So(rawQuery, ShouldEqual, `Raw query`)
+ })
+
+ Convey("can render normal tags without operator", func() {
+ query := &Query{Tags: []*Tag{&Tag{Operator: "", Value: `value`, Key: "key"}}}
+
+ So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = 'value'`)
+ })
+
+ Convey("can render regex tags without operator", func() {
+ query := &Query{Tags: []*Tag{&Tag{Operator: "", Value: `/value/`, Key: "key"}}}
+
+ So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" =~ /value/`)
+ })
+
+ Convey("can render regex tags", func() {
+ query := &Query{Tags: []*Tag{&Tag{Operator: "=~", Value: `/value/`, Key: "key"}}}
+
+ So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" =~ /value/`)
+ })
+
+ Convey("can render number tags", func() {
+ query := &Query{Tags: []*Tag{&Tag{Operator: "=", Value: "10001", Key: "key"}}}
+
+ So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = '10001'`)
+ })
+
+ Convey("can render numbers less then condition tags", func() {
+ query := &Query{Tags: []*Tag{&Tag{Operator: "<", Value: "10001", Key: "key"}}}
+
+ So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" < 10001`)
+ })
+
+ Convey("can render number greather then condition tags", func() {
+ query := &Query{Tags: []*Tag{&Tag{Operator: ">", Value: "10001", Key: "key"}}}
+
+ So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" > 10001`)
+ })
+
+ Convey("can render string tags", func() {
+ query := &Query{Tags: []*Tag{&Tag{Operator: "=", Value: "value", Key: "key"}}}
+
+ So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = 'value'`)
+ })
+
+ Convey("can render regular measurement", func() {
+ query := &Query{Measurement: `apa`, Policy: "policy"}
+
+ So(query.renderMeasurement(), ShouldEqual, ` FROM "policy"."apa"`)
+ })
+
+ Convey("can render regexp measurement", func() {
+ query := &Query{Measurement: `/apa/`, Policy: "policy"}
+
+ So(query.renderMeasurement(), ShouldEqual, ` FROM "policy"./apa/`)
+ })
+ })
+}
diff --git a/pkg/tsdb/influxdb/response_parser.go b/pkg/tsdb/influxdb/response_parser.go
new file mode 100644
index 00000000000..8e9fa0022c3
--- /dev/null
+++ b/pkg/tsdb/influxdb/response_parser.go
@@ -0,0 +1,145 @@
+package influxdb
+
+import (
+ "encoding/json"
+ "fmt"
+ "regexp"
+ "strconv"
+ "strings"
+
+ "github.com/grafana/grafana/pkg/tsdb"
+ "gopkg.in/guregu/null.v3"
+)
+
+type ResponseParser struct{}
+
+var (
+ legendFormat *regexp.Regexp
+)
+
+func init() {
+ legendFormat = regexp.MustCompile(`\[\[(\w+?)*\]\]*|\$\s*(\w+?)*`)
+}
+
+func (rp *ResponseParser) Parse(response *Response, query *Query) *tsdb.QueryResult {
+ queryRes := tsdb.NewQueryResult()
+
+ for _, result := range response.Results {
+ queryRes.Series = append(queryRes.Series, rp.transformRows(result.Series, queryRes, query)...)
+ }
+
+ return queryRes
+}
+
+func (rp *ResponseParser) transformRows(rows []Row, queryResult *tsdb.QueryResult, query *Query) tsdb.TimeSeriesSlice {
+ var result tsdb.TimeSeriesSlice
+
+ for _, row := range rows {
+ for columnIndex, column := range row.Columns {
+ if column == "time" {
+ continue
+ }
+
+ var points tsdb.TimeSeriesPoints
+ for _, valuePair := range row.Values {
+ point, err := rp.parseTimepoint(valuePair, columnIndex)
+ if err == nil {
+ points = append(points, point)
+ }
+ }
+ result = append(result, &tsdb.TimeSeries{
+ Name: rp.formatSerieName(row, column, query),
+ Points: points,
+ })
+ }
+ }
+
+ return result
+}
+
+func (rp *ResponseParser) formatSerieName(row Row, column string, query *Query) string {
+ if query.Alias == "" {
+ return rp.buildSerieNameFromQuery(row, column)
+ }
+
+ nameSegment := strings.Split(row.Name, ".")
+
+ result := legendFormat.ReplaceAllFunc([]byte(query.Alias), func(in []byte) []byte {
+ aliasFormat := string(in)
+ aliasFormat = strings.Replace(aliasFormat, "[[", "", 1)
+ aliasFormat = strings.Replace(aliasFormat, "]]", "", 1)
+ aliasFormat = strings.Replace(aliasFormat, "$", "", 1)
+
+ if aliasFormat == "m" || aliasFormat == "measurement" {
+ return []byte(query.Measurement)
+ }
+ if aliasFormat == "col" {
+ return []byte(column)
+ }
+
+ pos, err := strconv.Atoi(aliasFormat)
+ if err == nil && len(nameSegment) >= pos {
+ return []byte(nameSegment[pos])
+ }
+
+ if !strings.HasPrefix(aliasFormat, "tag_") {
+ return in
+ }
+
+ tagKey := strings.Replace(aliasFormat, "tag_", "", 1)
+ tagValue, exist := row.Tags[tagKey]
+ if exist {
+ return []byte(tagValue)
+ }
+
+ return in
+ })
+
+ return string(result)
+}
+
+func (rp *ResponseParser) buildSerieNameFromQuery(row Row, column string) string {
+ var tags []string
+
+ for k, v := range row.Tags {
+ tags = append(tags, fmt.Sprintf("%s: %s", k, v))
+ }
+
+ tagText := ""
+ if len(tags) > 0 {
+ tagText = fmt.Sprintf(" { %s }", strings.Join(tags, " "))
+ }
+
+ return fmt.Sprintf("%s.%s%s", row.Name, column, tagText)
+}
+
+func (rp *ResponseParser) parseTimepoint(valuePair []interface{}, valuePosition int) (tsdb.TimePoint, error) {
+ var value null.Float = rp.parseValue(valuePair[valuePosition])
+
+ timestampNumber, _ := valuePair[0].(json.Number)
+ timestamp, err := timestampNumber.Float64()
+ if err != nil {
+ return tsdb.TimePoint{}, err
+ }
+
+ return tsdb.NewTimePoint(value, timestamp), nil
+}
+
+func (rp *ResponseParser) parseValue(value interface{}) null.Float {
+ number, ok := value.(json.Number)
+ if !ok {
+ return null.FloatFromPtr(nil)
+ }
+
+ fvalue, err := number.Float64()
+ if err == nil {
+ return null.FloatFrom(fvalue)
+ }
+
+ ivalue, err := number.Int64()
+ if err == nil {
+ return null.FloatFrom(float64(ivalue))
+ }
+
+ return null.FloatFromPtr(nil)
+}
diff --git a/pkg/tsdb/influxdb/response_parser_test.go b/pkg/tsdb/influxdb/response_parser_test.go
new file mode 100644
index 00000000000..67667f565d5
--- /dev/null
+++ b/pkg/tsdb/influxdb/response_parser_test.go
@@ -0,0 +1,164 @@
+package influxdb
+
+import (
+ "encoding/json"
+ "testing"
+
+ "github.com/grafana/grafana/pkg/setting"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestInfluxdbResponseParser(t *testing.T) {
+ Convey("Influxdb response parser", t, func() {
+ Convey("Response parser", func() {
+ parser := &ResponseParser{}
+
+ setting.NewConfigContext(&setting.CommandLineArgs{
+ HomePath: "../../../",
+ })
+
+ response := &Response{
+ Results: []Result{
+ Result{
+ Series: []Row{
+ {
+ Name: "cpu",
+ Columns: []string{"time", "mean", "sum"},
+ Tags: map[string]string{"datacenter": "America"},
+ Values: [][]interface{}{
+ {json.Number("111"), json.Number("222"), json.Number("333")},
+ {json.Number("111"), json.Number("222"), json.Number("333")},
+ {json.Number("111"), json.Number("null"), json.Number("333")},
+ },
+ },
+ },
+ },
+ },
+ }
+
+ query := &Query{}
+
+ result := parser.Parse(response, query)
+
+ Convey("can parse all series", func() {
+ So(len(result.Series), ShouldEqual, 2)
+ })
+
+ Convey("can parse all points", func() {
+ So(len(result.Series[0].Points), ShouldEqual, 3)
+ So(len(result.Series[1].Points), ShouldEqual, 3)
+ })
+
+ Convey("can parse multi row result", func() {
+ So(result.Series[0].Points[1][0].Float64, ShouldEqual, float64(222))
+ So(result.Series[1].Points[1][0].Float64, ShouldEqual, float64(333))
+ })
+
+ Convey("can parse null points", func() {
+ So(result.Series[0].Points[2][0].Valid, ShouldBeFalse)
+ })
+
+ Convey("can format serie names", func() {
+ So(result.Series[0].Name, ShouldEqual, "cpu.mean { datacenter: America }")
+ So(result.Series[1].Name, ShouldEqual, "cpu.sum { datacenter: America }")
+ })
+ })
+
+ Convey("Response parser with alias", func() {
+ parser := &ResponseParser{}
+
+ response := &Response{
+ Results: []Result{
+ Result{
+ Series: []Row{
+ {
+ Name: "cpu.upc",
+ Columns: []string{"time", "mean", "sum"},
+ Tags: map[string]string{"datacenter": "America"},
+ Values: [][]interface{}{
+ {json.Number("111"), json.Number("222"), json.Number("333")},
+ },
+ },
+ },
+ },
+ },
+ }
+
+ Convey("$ alias", func() {
+ Convey("simple alias", func() {
+ query := &Query{Alias: "serie alias"}
+ result := parser.Parse(response, query)
+
+ So(result.Series[0].Name, ShouldEqual, "serie alias")
+ })
+
+ Convey("measurement alias", func() {
+ query := &Query{Alias: "alias $m $measurement", Measurement: "10m"}
+ result := parser.Parse(response, query)
+
+ So(result.Series[0].Name, ShouldEqual, "alias 10m 10m")
+ })
+
+ Convey("column alias", func() {
+ query := &Query{Alias: "alias $col", Measurement: "10m"}
+ result := parser.Parse(response, query)
+
+ So(result.Series[0].Name, ShouldEqual, "alias mean")
+ So(result.Series[1].Name, ShouldEqual, "alias sum")
+ })
+
+ Convey("tag alias", func() {
+ query := &Query{Alias: "alias $tag_datacenter"}
+ result := parser.Parse(response, query)
+
+ So(result.Series[0].Name, ShouldEqual, "alias America")
+ })
+
+ Convey("segment alias", func() {
+ query := &Query{Alias: "alias $1"}
+ result := parser.Parse(response, query)
+
+ So(result.Series[0].Name, ShouldEqual, "alias upc")
+ })
+
+ Convey("segment position out of bound", func() {
+ query := &Query{Alias: "alias $5"}
+ result := parser.Parse(response, query)
+
+ So(result.Series[0].Name, ShouldEqual, "alias $5")
+ })
+ })
+
+ Convey("[[]] alias", func() {
+ Convey("simple alias", func() {
+ query := &Query{Alias: "serie alias"}
+ result := parser.Parse(response, query)
+
+ So(result.Series[0].Name, ShouldEqual, "serie alias")
+ })
+
+ Convey("measurement alias", func() {
+ query := &Query{Alias: "alias [[m]] [[measurement]]", Measurement: "10m"}
+ result := parser.Parse(response, query)
+
+ So(result.Series[0].Name, ShouldEqual, "alias 10m 10m")
+ })
+
+ Convey("column alias", func() {
+ query := &Query{Alias: "alias [[col]]", Measurement: "10m"}
+ result := parser.Parse(response, query)
+
+ So(result.Series[0].Name, ShouldEqual, "alias mean")
+ So(result.Series[1].Name, ShouldEqual, "alias sum")
+ })
+
+ Convey("tag alias", func() {
+ query := &Query{Alias: "alias [[tag_datacenter]]"}
+ result := parser.Parse(response, query)
+
+ So(result.Series[0].Name, ShouldEqual, "alias America")
+ })
+ })
+ })
+ })
+}
diff --git a/pkg/tsdb/interval.go b/pkg/tsdb/interval.go
new file mode 100644
index 00000000000..71caf122c13
--- /dev/null
+++ b/pkg/tsdb/interval.go
@@ -0,0 +1,145 @@
+package tsdb
+
+import (
+ "fmt"
+ "time"
+)
+
+var (
+ defaultRes int64 = 1500
+ minInterval time.Duration = 1 * time.Millisecond
+ year time.Duration = time.Hour * 24 * 365
+ day time.Duration = time.Hour * 24 * 365
+)
+
+func CalculateInterval(timerange *TimeRange) string {
+ interval := time.Duration((timerange.MustGetTo().UnixNano() - timerange.MustGetFrom().UnixNano()) / defaultRes)
+
+ if interval < minInterval {
+ return formatDuration(minInterval)
+ }
+
+ return formatDuration(roundInterval(interval))
+}
+
+func formatDuration(inter time.Duration) string {
+ if inter >= year {
+ return fmt.Sprintf("%dy", inter/year)
+ }
+
+ if inter >= day {
+ return fmt.Sprintf("%dd", inter/day)
+ }
+
+ if inter >= time.Hour {
+ return fmt.Sprintf("%dh", inter/time.Hour)
+ }
+
+ if inter >= time.Minute {
+ return fmt.Sprintf("%dm", inter/time.Minute)
+ }
+
+ if inter >= time.Second {
+ return fmt.Sprintf("%ds", inter/time.Second)
+ }
+
+ if inter >= time.Millisecond {
+ return fmt.Sprintf("%dms", inter/time.Millisecond)
+ }
+
+ return "1ms"
+}
+
+func roundInterval(interval time.Duration) time.Duration {
+ switch true {
+ // 0.015s
+ case interval <= 15*time.Millisecond:
+ return time.Millisecond * 10 // 0.01s
+ // 0.035s
+ case interval <= 35*time.Millisecond:
+ return time.Millisecond * 20 // 0.02s
+ // 0.075s
+ case interval <= 75*time.Millisecond:
+ return time.Millisecond * 50 // 0.05s
+ // 0.15s
+ case interval <= 150*time.Millisecond:
+ return time.Millisecond * 100 // 0.1s
+ // 0.35s
+ case interval <= 350*time.Millisecond:
+ return time.Millisecond * 200 // 0.2s
+ // 0.75s
+ case interval <= 750*time.Millisecond:
+ return time.Millisecond * 500 // 0.5s
+ // 1.5s
+ case interval <= 1500*time.Millisecond:
+ return time.Millisecond * 1000 // 1s
+ // 3.5s
+ case interval <= 3500*time.Millisecond:
+ return time.Millisecond * 2000 // 2s
+ // 7.5s
+ case interval <= 7500*time.Millisecond:
+ return time.Millisecond * 5000 // 5s
+ // 12.5s
+ case interval <= 12500*time.Millisecond:
+ return time.Millisecond * 10000 // 10s
+ // 17.5s
+ case interval <= 17500*time.Millisecond:
+ return time.Millisecond * 15000 // 15s
+ // 25s
+ case interval <= 25000*time.Millisecond:
+ return time.Millisecond * 20000 // 20s
+ // 45s
+ case interval <= 45000*time.Millisecond:
+ return time.Millisecond * 30000 // 30s
+ // 1.5m
+ case interval <= 90000*time.Millisecond:
+ return time.Millisecond * 60000 // 1m
+ // 3.5m
+ case interval <= 210000*time.Millisecond:
+ return time.Millisecond * 120000 // 2m
+ // 7.5m
+ case interval <= 450000*time.Millisecond:
+ return time.Millisecond * 300000 // 5m
+ // 12.5m
+ case interval <= 750000*time.Millisecond:
+ return time.Millisecond * 600000 // 10m
+ // 12.5m
+ case interval <= 1050000*time.Millisecond:
+ return time.Millisecond * 900000 // 15m
+ // 25m
+ case interval <= 1500000*time.Millisecond:
+ return time.Millisecond * 1200000 // 20m
+ // 45m
+ case interval <= 2700000*time.Millisecond:
+ return time.Millisecond * 1800000 // 30m
+ // 1.5h
+ case interval <= 5400000*time.Millisecond:
+ return time.Millisecond * 3600000 // 1h
+ // 2.5h
+ case interval <= 9000000*time.Millisecond:
+ return time.Millisecond * 7200000 // 2h
+ // 4.5h
+ case interval <= 16200000*time.Millisecond:
+ return time.Millisecond * 10800000 // 3h
+ // 9h
+ case interval <= 32400000*time.Millisecond:
+ return time.Millisecond * 21600000 // 6h
+ // 24h
+ case interval <= 86400000*time.Millisecond:
+ return time.Millisecond * 43200000 // 12h
+ // 48h
+ case interval <= 172800000*time.Millisecond:
+ return time.Millisecond * 86400000 // 24h
+ // 1w
+ case interval <= 604800000*time.Millisecond:
+ return time.Millisecond * 86400000 // 24h
+ // 3w
+ case interval <= 1814400000*time.Millisecond:
+ return time.Millisecond * 604800000 // 1w
+ // 2y
+ case interval < 3628800000*time.Millisecond:
+ return time.Millisecond * 2592000000 // 30d
+ default:
+ return time.Millisecond * 31536000000 // 1y
+ }
+}
diff --git a/pkg/tsdb/interval_test.go b/pkg/tsdb/interval_test.go
new file mode 100644
index 00000000000..c06e1879668
--- /dev/null
+++ b/pkg/tsdb/interval_test.go
@@ -0,0 +1,57 @@
+package tsdb
+
+import (
+ "testing"
+ "time"
+
+ "github.com/grafana/grafana/pkg/setting"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestInterval(t *testing.T) {
+ Convey("Default interval ", t, func() {
+ setting.NewConfigContext(&setting.CommandLineArgs{
+ HomePath: "../../",
+ })
+
+ Convey("for 5min", func() {
+ tr := NewTimeRange("5m", "now")
+
+ interval := CalculateInterval(tr)
+ So(interval, ShouldEqual, "200ms")
+ })
+
+ Convey("for 15min", func() {
+ tr := NewTimeRange("15m", "now")
+
+ interval := CalculateInterval(tr)
+ So(interval, ShouldEqual, "500ms")
+ })
+
+ Convey("for 30min", func() {
+ tr := NewTimeRange("30m", "now")
+
+ interval := CalculateInterval(tr)
+ So(interval, ShouldEqual, "1s")
+ })
+
+ Convey("for 1h", func() {
+ tr := NewTimeRange("1h", "now")
+
+ interval := CalculateInterval(tr)
+ So(interval, ShouldEqual, "2s")
+ })
+
+ Convey("Round interval", func() {
+ So(roundInterval(time.Millisecond*30), ShouldEqual, time.Millisecond*20)
+ So(roundInterval(time.Millisecond*45), ShouldEqual, time.Millisecond*50)
+ })
+
+ Convey("Format value", func() {
+ So(formatDuration(time.Second*61), ShouldEqual, "1m")
+ So(formatDuration(time.Millisecond*30), ShouldEqual, "30ms")
+ So(formatDuration(time.Hour*23), ShouldEqual, "23h")
+ So(formatDuration(time.Hour*24*367), ShouldEqual, "1y")
+ })
+ })
+}
diff --git a/pkg/tsdb/models.go b/pkg/tsdb/models.go
new file mode 100644
index 00000000000..e95713e7077
--- /dev/null
+++ b/pkg/tsdb/models.go
@@ -0,0 +1,87 @@
+package tsdb
+
+import (
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/models"
+ "gopkg.in/guregu/null.v3"
+)
+
+type Query struct {
+ RefId string
+ Model *simplejson.Json
+ Depends []string
+ DataSource *models.DataSource
+ Results []*TimeSeries
+ Exclude bool
+ MaxDataPoints int64
+ IntervalMs int64
+}
+
+type QuerySlice []*Query
+
+type Request struct {
+ TimeRange *TimeRange
+ Queries QuerySlice
+}
+
+type Response struct {
+ BatchTimings []*BatchTiming `json:"timings"`
+ Results map[string]*QueryResult `json:"results"`
+}
+
+type BatchTiming struct {
+ TimeElapsed int64
+}
+
+type BatchResult struct {
+ Error error
+ QueryResults map[string]*QueryResult
+ Timings *BatchTiming
+}
+
+func (br *BatchResult) WithError(err error) *BatchResult {
+ br.Error = err
+ return br
+}
+
+type QueryResult struct {
+ Error error `json:"error"`
+ RefId string `json:"refId"`
+ Series TimeSeriesSlice `json:"series"`
+}
+
+type TimeSeries struct {
+ Name string `json:"name"`
+ Points TimeSeriesPoints `json:"points"`
+}
+
+type TimePoint [2]null.Float
+type TimeSeriesPoints []TimePoint
+type TimeSeriesSlice []*TimeSeries
+
+func NewQueryResult() *QueryResult {
+ return &QueryResult{
+ Series: make(TimeSeriesSlice, 0),
+ }
+}
+
+func NewTimePoint(value null.Float, timestamp float64) TimePoint {
+ return TimePoint{value, null.FloatFrom(timestamp)}
+}
+
+func NewTimeSeriesPointsFromArgs(values ...float64) TimeSeriesPoints {
+ points := make(TimeSeriesPoints, 0)
+
+ for i := 0; i < len(values); i += 2 {
+ points = append(points, NewTimePoint(null.FloatFrom(values[i]), values[i+1]))
+ }
+
+ return points
+}
+
+func NewTimeSeries(name string, points TimeSeriesPoints) *TimeSeries {
+ return &TimeSeries{
+ Name: name,
+ Points: points,
+ }
+}
diff --git a/pkg/tsdb/mqe/httpClient.go b/pkg/tsdb/mqe/httpClient.go
new file mode 100644
index 00000000000..c4a7807f9cb
--- /dev/null
+++ b/pkg/tsdb/mqe/httpClient.go
@@ -0,0 +1,129 @@
+package mqe
+
+import (
+ "context"
+ "net/http"
+ "net/url"
+ "path"
+ "strings"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+ "github.com/grafana/grafana/pkg/tsdb"
+
+ "golang.org/x/net/context/ctxhttp"
+)
+
+var (
+ MaxWorker int = 4
+)
+
+type apiClient struct {
+ *models.DataSource
+ log log.Logger
+ httpClient *http.Client
+ responseParser *ResponseParser
+}
+
+func NewApiClient(httpClient *http.Client, datasource *models.DataSource) *apiClient {
+ return &apiClient{
+ DataSource: datasource,
+ log: log.New("tsdb.mqe"),
+ httpClient: httpClient,
+ responseParser: NewResponseParser(),
+ }
+}
+
+func (e *apiClient) PerformRequests(ctx context.Context, queries []QueryToSend) (*tsdb.QueryResult, error) {
+ queryResult := &tsdb.QueryResult{}
+
+ queryCount := len(queries)
+ jobsChan := make(chan QueryToSend, queryCount)
+ resultChan := make(chan []*tsdb.TimeSeries, queryCount)
+ errorsChan := make(chan error, 1)
+ for w := 1; w <= MaxWorker; w++ {
+ go e.spawnWorker(ctx, w, jobsChan, resultChan, errorsChan)
+ }
+
+ for _, v := range queries {
+ jobsChan <- v
+ }
+ close(jobsChan)
+
+ resultCounter := 0
+ for {
+ select {
+ case timeseries := <-resultChan:
+ queryResult.Series = append(queryResult.Series, timeseries...)
+ resultCounter++
+
+ if resultCounter == queryCount {
+ close(resultChan)
+ return queryResult, nil
+ }
+ case err := <-errorsChan:
+ return nil, err
+ case <-ctx.Done():
+ return nil, ctx.Err()
+ }
+ }
+}
+
+func (e *apiClient) spawnWorker(ctx context.Context, id int, jobs chan QueryToSend, results chan []*tsdb.TimeSeries, errors chan error) {
+ e.log.Debug("Spawning worker", "id", id)
+ for query := range jobs {
+ if setting.Env == setting.DEV {
+ e.log.Debug("Sending request", "query", query.RawQuery)
+ }
+
+ req, err := e.createRequest(query.RawQuery)
+
+ resp, err := ctxhttp.Do(ctx, e.httpClient, req)
+ if err != nil {
+ errors <- err
+ return
+ }
+
+ series, err := e.responseParser.Parse(resp, query.QueryRef)
+ if err != nil {
+ errors <- err
+ return
+ }
+
+ results <- series
+ }
+ e.log.Debug("Worker is complete", "id", id)
+}
+
+func (e *apiClient) createRequest(query string) (*http.Request, error) {
+ u, err := url.Parse(e.Url)
+ if err != nil {
+ return nil, err
+ }
+
+ u.Path = path.Join(u.Path, "query")
+
+ payload := simplejson.New()
+ payload.Set("query", query)
+
+ jsonPayload, err := payload.MarshalJSON()
+ if err != nil {
+ return nil, err
+ }
+
+ req, err := http.NewRequest(http.MethodPost, u.String(), strings.NewReader(string(jsonPayload)))
+ if err != nil {
+ return nil, err
+ }
+
+ req.Header.Set("User-Agent", "Grafana")
+ req.Header.Set("Content-Type", "application/json")
+
+ if e.BasicAuth {
+ req.SetBasicAuth(e.BasicAuthUser, e.BasicAuthPassword)
+ }
+
+ return req, nil
+}
diff --git a/pkg/tsdb/mqe/model_parser.go b/pkg/tsdb/mqe/model_parser.go
new file mode 100644
index 00000000000..d139bea9c15
--- /dev/null
+++ b/pkg/tsdb/mqe/model_parser.go
@@ -0,0 +1,60 @@
+package mqe
+
+import (
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/tsdb"
+)
+
+func NewQueryParser() *QueryParser {
+ return &QueryParser{}
+}
+
+type QueryParser struct{}
+
+func (qp *QueryParser) Parse(model *simplejson.Json, dsInfo *models.DataSource, queryContext *tsdb.QueryContext) (*Query, error) {
+ query := &Query{TimeRange: queryContext.TimeRange}
+ query.AddClusterToAlias = model.Get("addClusterToAlias").MustBool(false)
+ query.AddHostToAlias = model.Get("addHostToAlias").MustBool(false)
+ query.UseRawQuery = model.Get("rawQuery").MustBool(false)
+ query.RawQuery = model.Get("query").MustString("")
+
+ query.Cluster = model.Get("cluster").MustStringArray([]string{})
+ query.Hosts = model.Get("hosts").MustStringArray([]string{})
+
+ var metrics []Metric
+ var err error
+ for _, metricsObj := range model.Get("metrics").MustArray() {
+ metricJson := simplejson.NewFromAny(metricsObj)
+ var m Metric
+
+ m.Alias = metricJson.Get("alias").MustString("")
+ m.Metric, err = metricJson.Get("metric").String()
+ if err != nil {
+ return nil, err
+ }
+
+ metrics = append(metrics, m)
+ }
+
+ query.Metrics = metrics
+
+ var functions []Function
+ for _, functionListObj := range model.Get("functionList").MustArray() {
+ functionListJson := simplejson.NewFromAny(functionListObj)
+ var f Function
+
+ f.Func = functionListJson.Get("func").MustString("")
+ if err != nil {
+ return nil, err
+ }
+
+ if f.Func != "" {
+ functions = append(functions, f)
+ }
+ }
+
+ query.FunctionList = functions
+
+ return query, nil
+}
diff --git a/pkg/tsdb/mqe/model_parser_test.go b/pkg/tsdb/mqe/model_parser_test.go
new file mode 100644
index 00000000000..58e7b7eb28d
--- /dev/null
+++ b/pkg/tsdb/mqe/model_parser_test.go
@@ -0,0 +1,127 @@
+package mqe
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/tsdb"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestMQEQueryParser(t *testing.T) {
+ Convey("MQE query parser", t, func() {
+ parser := &QueryParser{}
+
+ dsInfo := &models.DataSource{JsonData: simplejson.New()}
+ queryContext := &tsdb.QueryContext{}
+
+ Convey("can parse simple mqe model", func() {
+ json := `
+ {
+ "cluster": [],
+ "hosts": [
+ "staples-lab-1"
+ ],
+ "metrics": [
+ {
+ "metric": "os.cpu.all*"
+ }
+ ],
+ "rawQuery": "",
+ "refId": "A"
+ }
+ `
+ modelJson, err := simplejson.NewJson([]byte(json))
+ So(err, ShouldBeNil)
+
+ query, err := parser.Parse(modelJson, dsInfo, queryContext)
+ So(err, ShouldBeNil)
+ So(query.UseRawQuery, ShouldBeFalse)
+
+ So(len(query.Cluster), ShouldEqual, 0)
+ So(query.Hosts[0], ShouldEqual, "staples-lab-1")
+ So(query.Metrics[0].Metric, ShouldEqual, "os.cpu.all*")
+ })
+
+ Convey("can parse multi serie mqe model", func() {
+ json := `
+ {
+ "cluster": [
+ "demoapp"
+ ],
+ "hosts": [
+ "staples-lab-1"
+ ],
+ "metrics": [
+ {
+ "metric": "os.cpu.all.active_percentage"
+ },
+ {
+ "metric": "os.disk.sda.io_time"
+ }
+ ],
+ "functionList": [
+ {
+ "func": "aggregate.min"
+ },
+ {
+ "func": "aggregate.max"
+ }
+ ],
+ "rawQuery": "",
+ "refId": "A",
+ "addClusterToAlias": true,
+ "addHostToAlias": true
+ }
+ `
+ modelJson, err := simplejson.NewJson([]byte(json))
+ So(err, ShouldBeNil)
+
+ query, err := parser.Parse(modelJson, dsInfo, queryContext)
+ So(err, ShouldBeNil)
+ So(query.UseRawQuery, ShouldBeFalse)
+ So(query.Cluster[0], ShouldEqual, "demoapp")
+ So(query.Metrics[0].Metric, ShouldEqual, "os.cpu.all.active_percentage")
+ So(query.Metrics[1].Metric, ShouldEqual, "os.disk.sda.io_time")
+ So(query.FunctionList[0].Func, ShouldEqual, "aggregate.min")
+ So(query.FunctionList[1].Func, ShouldEqual, "aggregate.max")
+ })
+
+ Convey("can parse raw query", func() {
+ json := `
+ {
+ "addClusterToAlias": true,
+ "addHostToAlias": true,
+ "cluster": [],
+ "hosts": [
+ "staples-lab-1"
+ ],
+ "metrics": [
+ {
+ "alias": "cpu active",
+ "metric": "os.cpu.all.active_percentage"
+ },
+ {
+ "alias": "disk sda time",
+ "metric": "os.disk.sda.io_time"
+ }
+ ],
+ "rawQuery": true,
+ "query": "raw-query",
+ "refId": "A"
+ }
+ `
+ modelJson, err := simplejson.NewJson([]byte(json))
+ So(err, ShouldBeNil)
+
+ query, err := parser.Parse(modelJson, dsInfo, queryContext)
+ So(err, ShouldBeNil)
+
+ So(query.UseRawQuery, ShouldBeTrue)
+ So(query.RawQuery, ShouldEqual, "raw-query")
+ So(query.AddClusterToAlias, ShouldBeTrue)
+ So(query.AddHostToAlias, ShouldBeTrue)
+ })
+ })
+}
diff --git a/pkg/tsdb/mqe/mqe.go b/pkg/tsdb/mqe/mqe.go
new file mode 100644
index 00000000000..5d5f0950de5
--- /dev/null
+++ b/pkg/tsdb/mqe/mqe.go
@@ -0,0 +1,84 @@
+package mqe
+
+import (
+ "context"
+ "net/http"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/tsdb"
+)
+
+type MQEExecutor struct {
+ *models.DataSource
+ queryParser *QueryParser
+ apiClient *apiClient
+ httpClient *http.Client
+ log log.Logger
+ tokenClient *TokenClient
+}
+
+func NewMQEExecutor(dsInfo *models.DataSource) (tsdb.Executor, error) {
+ httpclient, err := dsInfo.GetHttpClient()
+ if err != nil {
+ return nil, err
+ }
+
+ return &MQEExecutor{
+ DataSource: dsInfo,
+ httpClient: httpclient,
+ log: log.New("tsdb.mqe"),
+ queryParser: NewQueryParser(),
+ apiClient: NewApiClient(httpclient, dsInfo),
+ tokenClient: NewTokenClient(dsInfo),
+ }, nil
+}
+
+func init() {
+ tsdb.RegisterExecutor("mqe-datasource", NewMQEExecutor)
+}
+
+type QueryToSend struct {
+ RawQuery string
+ QueryRef *Query
+}
+
+func (e *MQEExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, queryContext *tsdb.QueryContext) *tsdb.BatchResult {
+ result := &tsdb.BatchResult{}
+
+ availableSeries, err := e.tokenClient.GetTokenData(ctx)
+ if err != nil {
+ return result.WithError(err)
+ }
+
+ var mqeQueries []*Query
+ for _, v := range queries {
+ q, err := e.queryParser.Parse(v.Model, e.DataSource, queryContext)
+ if err != nil {
+ return result.WithError(err)
+ }
+ mqeQueries = append(mqeQueries, q)
+ }
+
+ var rawQueries []QueryToSend
+ for _, v := range mqeQueries {
+ queries, err := v.Build(availableSeries.Metrics)
+ if err != nil {
+ return result.WithError(err)
+ }
+
+ rawQueries = append(rawQueries, queries...)
+ }
+
+ e.log.Debug("Sending request", "url", e.DataSource.Url)
+
+ queryResult, err := e.apiClient.PerformRequests(ctx, rawQueries)
+ if err != nil {
+ return result.WithError(err)
+ }
+
+ result.QueryResults = make(map[string]*tsdb.QueryResult)
+ result.QueryResults["A"] = queryResult
+
+ return result
+}
diff --git a/pkg/tsdb/mqe/response_parser.go b/pkg/tsdb/mqe/response_parser.go
new file mode 100644
index 00000000000..283098e74f3
--- /dev/null
+++ b/pkg/tsdb/mqe/response_parser.go
@@ -0,0 +1,103 @@
+package mqe
+
+import (
+ "encoding/json"
+ "io/ioutil"
+ "net/http"
+
+ null "gopkg.in/guregu/null.v3"
+
+ "fmt"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/tsdb"
+)
+
+func NewResponseParser() *ResponseParser {
+ return &ResponseParser{
+ log: log.New("tsdb.mqe"),
+ }
+}
+
+type MQEResponse struct {
+ Success bool `json:"success"`
+ Name string `json:"name"`
+ Body []MQEResponseSerie `json:"body"`
+}
+
+type ResponseTimeRange struct {
+ Start int64 `json:"start"`
+ End int64 `json:"end"`
+ Resolution int64 `json:"Resolution"`
+}
+
+type MQEResponseSerie struct {
+ Query string `json:"query"`
+ Name string `json:"name"`
+ Type string `json:"type"`
+ Series []MQESerie `json:"series"`
+ TimeRange ResponseTimeRange `json:"timerange"`
+}
+
+type MQESerie struct {
+ Values []null.Float `json:"values"`
+ Tagset map[string]string `json:"tagset"`
+}
+
+type ResponseParser struct {
+ log log.Logger
+}
+
+func (parser *ResponseParser) Parse(res *http.Response, queryRef *Query) ([]*tsdb.TimeSeries, error) {
+ body, err := ioutil.ReadAll(res.Body)
+ defer res.Body.Close()
+ if err != nil {
+ return nil, err
+ }
+
+ if res.StatusCode/100 != 2 {
+ parser.log.Error("Request failed", "status code", res.StatusCode, "body", string(body))
+ return nil, fmt.Errorf("Returned invalid statuscode")
+ }
+
+ var data *MQEResponse = &MQEResponse{}
+ err = json.Unmarshal(body, data)
+ if err != nil {
+ parser.log.Info("Failed to unmarshal response", "error", err, "status", res.Status, "body", string(body))
+ return nil, err
+ }
+
+ if !data.Success {
+ return nil, fmt.Errorf("Request failed.")
+ }
+
+ var series []*tsdb.TimeSeries
+ for _, body := range data.Body {
+ for _, mqeSerie := range body.Series {
+ namePrefix := ""
+
+ //append predefined tags to seriename
+ for key, value := range mqeSerie.Tagset {
+ if key == "cluster" && queryRef.AddClusterToAlias {
+ namePrefix += value + " "
+ }
+ }
+ for key, value := range mqeSerie.Tagset {
+ if key == "host" && queryRef.AddHostToAlias {
+ namePrefix += value + " "
+ }
+ }
+
+ serie := &tsdb.TimeSeries{Name: namePrefix + body.Name}
+
+ for i, value := range mqeSerie.Values {
+ timestamp := body.TimeRange.Start + int64(i)*body.TimeRange.Resolution
+ serie.Points = append(serie.Points, tsdb.NewTimePoint(value, float64(timestamp)))
+ }
+
+ series = append(series, serie)
+ }
+ }
+
+ return series, nil
+}
diff --git a/pkg/tsdb/mqe/response_parser_test.go b/pkg/tsdb/mqe/response_parser_test.go
new file mode 100644
index 00000000000..63761841d97
--- /dev/null
+++ b/pkg/tsdb/mqe/response_parser_test.go
@@ -0,0 +1,131 @@
+package mqe
+
+import (
+ "testing"
+
+ "net/http"
+ "strings"
+
+ "io/ioutil"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+var (
+ dummieJson string
+)
+
+func TestMQEResponseParser(t *testing.T) {
+ Convey("MQE response parser", t, func() {
+ parser := NewResponseParser()
+
+ Convey("Can parse response", func() {
+ queryRef := &Query{
+ AddClusterToAlias: true,
+ AddHostToAlias: true,
+ }
+
+ response := &http.Response{
+ StatusCode: 200,
+ Body: ioutil.NopCloser(strings.NewReader(dummieJson)),
+ }
+ res, err := parser.Parse(response, queryRef)
+ So(err, ShouldBeNil)
+ So(len(res), ShouldEqual, 2)
+ So(len(res[0].Points), ShouldEqual, 14)
+ So(res[0].Name, ShouldEqual, "demoapp staples-lab-1 os.disk.sda3.weighted_io_time")
+ startTime := 1479287280000
+ for i := 0; i < 11; i++ {
+ So(res[0].Points[i][0].Float64, ShouldEqual, i+1)
+ So(res[0].Points[i][1].Float64, ShouldEqual, startTime+(i*30000))
+ }
+ })
+ })
+}
+
+func init() {
+ dummieJson = `{
+ "success": true,
+ "name": "select",
+ "body": [
+ {
+ "query": "os.disk.sda3.weighted_io_time",
+ "name": "os.disk.sda3.weighted_io_time",
+ "type": "series",
+ "series": [
+ {
+ "tagset": {
+ "cluster": "demoapp",
+ "host": "staples-lab-1"
+ },
+ "values": [1,2,3,4,5,6,7,8,9,10,11, null, null, null]
+ },
+ {
+ "tagset": {
+ "cluster": "demoapp",
+ "host": "staples-lab-2"
+ },
+ "values": [11,10,9,8,7,6,5,4,3,2,1]
+ }
+ ],
+ "timerange": {
+ "start": 1479287280000,
+ "end": 1479287580000,
+ "resolution": 30000
+ }
+ }
+ ],
+ "metadata": {
+ "description": {
+ "cluster": [
+ "demoapp"
+ ],
+ "host": [
+ "staples-lab-1",
+ "staples-lab-2"
+ ]
+ },
+ "notes": null,
+ "profile": [
+ {
+ "name": "Parsing Query",
+ "start": "2016-11-16T04:16:21.874354721-05:00",
+ "finish": "2016-11-16T04:16:21.874762291-05:00"
+ },
+ {
+ "name": "Cassandra GetAllTags",
+ "start": "2016-11-16T04:16:21.874907171-05:00",
+ "finish": "2016-11-16T04:16:21.876401922-05:00"
+ },
+ {
+ "name": "CachedMetricMetadataAPI_GetAllTags_Expired",
+ "start": "2016-11-16T04:16:21.874904751-05:00",
+ "finish": "2016-11-16T04:16:21.876407852-05:00"
+ },
+ {
+ "name": "CachedMetricMetadataAPI_GetAllTags",
+ "start": "2016-11-16T04:16:21.874899491-05:00",
+ "finish": "2016-11-16T04:16:21.876410382-05:00"
+ },
+ {
+ "name": "Blueflood FetchSingleTimeseries Resolution",
+ "description": "os.disk.sda3.weighted_io_time [app=demoapp,host=staples-lab-1]\n at 30s",
+ "start": "2016-11-16T04:16:21.876623312-05:00",
+ "finish": "2016-11-16T04:16:21.881763444-05:00"
+ },
+ {
+ "name": "Blueflood FetchSingleTimeseries Resolution",
+ "description": "os.disk.sda3.weighted_io_time [app=demoapp,host=staples-lab-2]\n at 30s",
+ "start": "2016-11-16T04:16:21.876642682-05:00",
+ "finish": "2016-11-16T04:16:21.881895914-05:00"
+ },
+ {
+ "name": "Blueflood FetchMultipleTimeseries",
+ "start": "2016-11-16T04:16:21.876418022-05:00",
+ "finish": "2016-11-16T04:16:21.881921474-05:00"
+ }
+ ]
+ }
+ }
+ `
+}
diff --git a/pkg/tsdb/mqe/token_client.go b/pkg/tsdb/mqe/token_client.go
new file mode 100644
index 00000000000..df136738ab6
--- /dev/null
+++ b/pkg/tsdb/mqe/token_client.go
@@ -0,0 +1,101 @@
+package mqe
+
+import (
+ "context"
+ "encoding/json"
+ "fmt"
+ "io/ioutil"
+ "net/http"
+ "net/url"
+ "path"
+ "time"
+
+ "golang.org/x/net/context/ctxhttp"
+
+ "strconv"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/patrickmn/go-cache"
+)
+
+var tokenCache *cache.Cache
+
+func init() {
+ tokenCache = cache.New(5*time.Minute, 30*time.Second)
+}
+
+type TokenClient struct {
+ log log.Logger
+ Datasource *models.DataSource
+ HttpClient *http.Client
+}
+
+func NewTokenClient(datasource *models.DataSource) *TokenClient {
+ httpClient, _ := datasource.GetHttpClient()
+
+ return &TokenClient{
+ log: log.New("tsdb.mqe.tokenclient"),
+ Datasource: datasource,
+ HttpClient: httpClient,
+ }
+}
+
+func (client *TokenClient) GetTokenData(ctx context.Context) (*TokenBody, error) {
+ key := strconv.FormatInt(client.Datasource.Id, 10)
+
+ item, found := tokenCache.Get(key)
+ if found {
+ if result, ok := item.(*TokenBody); ok {
+ return result, nil
+ }
+ }
+
+ b, err := client.RequestTokenData(ctx)
+ if err != nil {
+ return nil, err
+ }
+
+ tokenCache.Set(key, b, cache.DefaultExpiration)
+
+ return b, nil
+}
+
+func (client *TokenClient) RequestTokenData(ctx context.Context) (*TokenBody, error) {
+ u, _ := url.Parse(client.Datasource.Url)
+ u.Path = path.Join(u.Path, "token")
+
+ req, err := http.NewRequest(http.MethodGet, u.String(), nil)
+ if err != nil {
+ client.log.Info("Failed to create request", "error", err)
+ }
+
+ res, err := ctxhttp.Do(ctx, client.HttpClient, req)
+ if err != nil {
+ return nil, err
+ }
+
+ body, err := ioutil.ReadAll(res.Body)
+ defer res.Body.Close()
+ if err != nil {
+ return nil, err
+ }
+
+ if res.StatusCode/100 != 2 {
+ client.log.Info("Request failed", "status", res.Status, "body", string(body))
+ return nil, fmt.Errorf("Request failed status: %v", res.Status)
+ }
+
+ var result *TokenResponse
+ err = json.Unmarshal(body, &result)
+ if err != nil {
+ client.log.Info("Failed to unmarshal response", "error", err, "status", res.Status, "body", string(body))
+ return nil, err
+ }
+
+ if !result.Success {
+ return nil, fmt.Errorf("Request failed for unknown reason.")
+ }
+
+ return &result.Body, nil
+}
diff --git a/pkg/tsdb/mqe/token_client_test.go b/pkg/tsdb/mqe/token_client_test.go
new file mode 100644
index 00000000000..f940f798b36
--- /dev/null
+++ b/pkg/tsdb/mqe/token_client_test.go
@@ -0,0 +1,27 @@
+package mqe
+
+import (
+ "context"
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestTokenClient(t *testing.T) {
+ SkipConvey("Token client", t, func() {
+ dsInfo := &models.DataSource{
+ JsonData: simplejson.New(),
+ Url: "",
+ }
+
+ client := NewTokenClient(dsInfo)
+
+ body, err := client.RequestTokenData(context.TODO())
+
+ So(err, ShouldBeNil)
+ //So(len(body.Functions), ShouldBeGreaterThan, 1)
+ So(len(body.Metrics), ShouldBeGreaterThan, 1)
+ })
+}
diff --git a/pkg/tsdb/mqe/types.go b/pkg/tsdb/mqe/types.go
new file mode 100644
index 00000000000..4fa2c1d4e7f
--- /dev/null
+++ b/pkg/tsdb/mqe/types.go
@@ -0,0 +1,135 @@
+package mqe
+
+import (
+ "fmt"
+
+ "strings"
+
+ "regexp"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/tsdb"
+)
+
+type Metric struct {
+ Metric string
+ Alias string
+}
+
+type Function struct {
+ Func string
+}
+
+type Query struct {
+ Metrics []Metric
+ Hosts []string
+ Cluster []string
+ FunctionList []Function
+ AddClusterToAlias bool
+ AddHostToAlias bool
+
+ TimeRange *tsdb.TimeRange
+ UseRawQuery bool
+ RawQuery string
+}
+
+var (
+ containsWildcardPattern *regexp.Regexp = regexp.MustCompile(`\*`)
+)
+
+func (q *Query) Build(availableSeries []string) ([]QueryToSend, error) {
+ var queriesToSend []QueryToSend
+ where := q.buildWhereClause()
+ functions := q.buildFunctionList()
+
+ for _, metric := range q.Metrics {
+ alias := ""
+ if metric.Alias != "" {
+ alias = fmt.Sprintf(" {%s}", metric.Alias)
+ }
+
+ if !containsWildcardPattern.Match([]byte(metric.Metric)) {
+ rawQuery := q.renderQuerystring(metric.Metric, functions, alias, where, q.TimeRange)
+ queriesToSend = append(queriesToSend, QueryToSend{
+ RawQuery: rawQuery,
+ QueryRef: q,
+ })
+ } else {
+ m := strings.Replace(metric.Metric, "*", ".*", -1)
+ mp, err := regexp.Compile(m)
+
+ if err != nil {
+ log.Error2("failed to compile regex for ", "metric", m)
+ continue
+ }
+
+ //TODO: this lookup should be cached
+ for _, wildcardMatch := range availableSeries {
+ if mp.Match([]byte(wildcardMatch)) {
+ rawQuery := q.renderQuerystring(wildcardMatch, functions, alias, where, q.TimeRange)
+ queriesToSend = append(queriesToSend, QueryToSend{
+ RawQuery: rawQuery,
+ QueryRef: q,
+ })
+ }
+ }
+ }
+ }
+
+ return queriesToSend, nil
+}
+
+func (q *Query) renderQuerystring(path, functions, alias, where string, timerange *tsdb.TimeRange) string {
+ return fmt.Sprintf(
+ "`%s`%s%s %s from %v to %v",
+ path,
+ functions,
+ alias,
+ where,
+ q.TimeRange.GetFromAsMsEpoch(),
+ q.TimeRange.GetToAsMsEpoch())
+}
+
+func (q *Query) buildFunctionList() string {
+ functions := ""
+ for _, v := range q.FunctionList {
+ functions = fmt.Sprintf("%s|%s", functions, v.Func)
+ }
+
+ return functions
+}
+
+func (q *Query) buildWhereClause() string {
+ hasApps := len(q.Cluster) > 0
+ hasHosts := len(q.Hosts) > 0
+
+ where := ""
+ if hasHosts || hasApps {
+ where += "where "
+ }
+
+ if hasApps {
+ apps := strings.Join(q.Cluster, "', '")
+ where += fmt.Sprintf("cluster in ('%s')", apps)
+ }
+
+ if hasHosts && hasApps {
+ where += " and "
+ }
+
+ if hasHosts {
+ hosts := strings.Join(q.Hosts, "', '")
+ where += fmt.Sprintf("host in ('%s')", hosts)
+ }
+
+ return where
+}
+
+type TokenBody struct {
+ Metrics []string
+}
+
+type TokenResponse struct {
+ Success bool
+ Body TokenBody
+}
diff --git a/pkg/tsdb/mqe/types_test.go b/pkg/tsdb/mqe/types_test.go
new file mode 100644
index 00000000000..1138e0599e7
--- /dev/null
+++ b/pkg/tsdb/mqe/types_test.go
@@ -0,0 +1,95 @@
+package mqe
+
+import (
+ "testing"
+
+ "time"
+
+ "fmt"
+
+ "github.com/grafana/grafana/pkg/tsdb"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestWildcardExpansion(t *testing.T) {
+ availableMetrics := []string{
+ "os.cpu.all.idle",
+ "os.cpu.1.idle",
+ "os.cpu.2.idle",
+ "os.cpu.3.idle",
+ }
+
+ now := time.Now()
+ from := now.Add((time.Minute*5)*-1).UnixNano() / int64(time.Millisecond)
+ to := now.UnixNano() / int64(time.Millisecond)
+
+ Convey("Can expanding query", t, func() {
+ Convey("Without wildcard series", func() {
+ query := &Query{
+ Metrics: []Metric{
+ Metric{Metric: "os.cpu.3.idle", Alias: ""},
+ Metric{Metric: "os.cpu.2.idle", Alias: ""},
+ Metric{Metric: "os.cpu.1.idle", Alias: "cpu"},
+ },
+ Hosts: []string{"staples-lab-1", "staples-lab-2"},
+ Cluster: []string{"demoapp-1", "demoapp-2"},
+ AddClusterToAlias: false,
+ AddHostToAlias: false,
+ FunctionList: []Function{
+ Function{Func: "aggregate.min"},
+ },
+ TimeRange: &tsdb.TimeRange{Now: now, From: "5m", To: "now"},
+ }
+
+ expandeQueries, err := query.Build(availableMetrics)
+ So(err, ShouldBeNil)
+ So(len(expandeQueries), ShouldEqual, 3)
+ So(expandeQueries[0].RawQuery, ShouldEqual, fmt.Sprintf("`os.cpu.3.idle`|aggregate.min where cluster in ('demoapp-1', 'demoapp-2') and host in ('staples-lab-1', 'staples-lab-2') from %v to %v", from, to))
+ So(expandeQueries[1].RawQuery, ShouldEqual, fmt.Sprintf("`os.cpu.2.idle`|aggregate.min where cluster in ('demoapp-1', 'demoapp-2') and host in ('staples-lab-1', 'staples-lab-2') from %v to %v", from, to))
+ So(expandeQueries[2].RawQuery, ShouldEqual, fmt.Sprintf("`os.cpu.1.idle`|aggregate.min {cpu} where cluster in ('demoapp-1', 'demoapp-2') and host in ('staples-lab-1', 'staples-lab-2') from %v to %v", from, to))
+ })
+
+ Convey("With two aggregate functions", func() {
+ query := &Query{
+ Metrics: []Metric{
+ Metric{Metric: "os.cpu.3.idle", Alias: ""},
+ },
+ Hosts: []string{"staples-lab-1", "staples-lab-2"},
+ Cluster: []string{"demoapp-1", "demoapp-2"},
+ AddClusterToAlias: false,
+ AddHostToAlias: false,
+ FunctionList: []Function{
+ Function{Func: "aggregate.min"},
+ Function{Func: "aggregate.max"},
+ },
+ TimeRange: &tsdb.TimeRange{Now: now, From: "5m", To: "now"},
+ }
+
+ expandeQueries, err := query.Build(availableMetrics)
+ So(err, ShouldBeNil)
+ So(len(expandeQueries), ShouldEqual, 1)
+ So(expandeQueries[0].RawQuery, ShouldEqual, fmt.Sprintf("`os.cpu.3.idle`|aggregate.min|aggregate.max where cluster in ('demoapp-1', 'demoapp-2') and host in ('staples-lab-1', 'staples-lab-2') from %v to %v", from, to))
+ })
+
+ Convey("Containg wildcard series", func() {
+ query := &Query{
+ Metrics: []Metric{
+ Metric{Metric: "os.cpu*", Alias: ""},
+ },
+ Hosts: []string{"staples-lab-1"},
+ AddClusterToAlias: false,
+ AddHostToAlias: false,
+ TimeRange: &tsdb.TimeRange{Now: now, From: "5m", To: "now"},
+ }
+
+ expandeQueries, err := query.Build(availableMetrics)
+ So(err, ShouldBeNil)
+ So(len(expandeQueries), ShouldEqual, 4)
+
+ So(expandeQueries[0].RawQuery, ShouldEqual, fmt.Sprintf("`os.cpu.all.idle` where host in ('staples-lab-1') from %v to %v", from, to))
+ So(expandeQueries[1].RawQuery, ShouldEqual, fmt.Sprintf("`os.cpu.1.idle` where host in ('staples-lab-1') from %v to %v", from, to))
+ So(expandeQueries[2].RawQuery, ShouldEqual, fmt.Sprintf("`os.cpu.2.idle` where host in ('staples-lab-1') from %v to %v", from, to))
+ So(expandeQueries[3].RawQuery, ShouldEqual, fmt.Sprintf("`os.cpu.3.idle` where host in ('staples-lab-1') from %v to %v", from, to))
+ })
+ })
+}
diff --git a/pkg/tsdb/opentsdb/opentsdb.go b/pkg/tsdb/opentsdb/opentsdb.go
new file mode 100644
index 00000000000..f5b6ffda7d2
--- /dev/null
+++ b/pkg/tsdb/opentsdb/opentsdb.go
@@ -0,0 +1,211 @@
+package opentsdb
+
+import (
+ "context"
+ "fmt"
+ "path"
+ "strconv"
+ "strings"
+
+ "golang.org/x/net/context/ctxhttp"
+
+ "encoding/json"
+ "io/ioutil"
+ "net/http"
+ "net/url"
+
+ "gopkg.in/guregu/null.v3"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+ "github.com/grafana/grafana/pkg/tsdb"
+)
+
+type OpenTsdbExecutor struct {
+ *models.DataSource
+ httpClient *http.Client
+}
+
+func NewOpenTsdbExecutor(datasource *models.DataSource) (tsdb.Executor, error) {
+ httpClient, err := datasource.GetHttpClient()
+
+ if err != nil {
+ return nil, err
+ }
+
+ return &OpenTsdbExecutor{
+ DataSource: datasource,
+ httpClient: httpClient,
+ }, nil
+}
+
+var (
+ plog log.Logger
+)
+
+func init() {
+ plog = log.New("tsdb.opentsdb")
+ tsdb.RegisterExecutor("opentsdb", NewOpenTsdbExecutor)
+}
+
+func (e *OpenTsdbExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, queryContext *tsdb.QueryContext) *tsdb.BatchResult {
+ result := &tsdb.BatchResult{}
+
+ var tsdbQuery OpenTsdbQuery
+
+ tsdbQuery.Start = queryContext.TimeRange.GetFromAsMsEpoch()
+ tsdbQuery.End = queryContext.TimeRange.GetToAsMsEpoch()
+
+ for _, query := range queries {
+ metric := e.buildMetric(query)
+ tsdbQuery.Queries = append(tsdbQuery.Queries, metric)
+ }
+
+ if setting.Env == setting.DEV {
+ plog.Debug("OpenTsdb request", "params", tsdbQuery)
+ }
+
+ req, err := e.createRequest(tsdbQuery)
+ if err != nil {
+ result.Error = err
+ return result
+ }
+
+ res, err := ctxhttp.Do(ctx, e.httpClient, req)
+ if err != nil {
+ result.Error = err
+ return result
+ }
+
+ queryResult, err := e.parseResponse(tsdbQuery, res)
+ if err != nil {
+ return result.WithError(err)
+ }
+
+ result.QueryResults = queryResult
+ return result
+}
+
+func (e *OpenTsdbExecutor) createRequest(data OpenTsdbQuery) (*http.Request, error) {
+ u, _ := url.Parse(e.Url)
+ u.Path = path.Join(u.Path, "api/query")
+
+ postData, err := json.Marshal(data)
+
+ req, err := http.NewRequest(http.MethodPost, u.String(), strings.NewReader(string(postData)))
+ if err != nil {
+ plog.Info("Failed to create request", "error", err)
+ return nil, fmt.Errorf("Failed to create request. error: %v", err)
+ }
+
+ req.Header.Set("Content-Type", "application/json")
+ if e.BasicAuth {
+ req.SetBasicAuth(e.BasicAuthUser, e.BasicAuthPassword)
+ }
+
+ return req, err
+}
+
+func (e *OpenTsdbExecutor) parseResponse(query OpenTsdbQuery, res *http.Response) (map[string]*tsdb.QueryResult, error) {
+
+ queryResults := make(map[string]*tsdb.QueryResult)
+ queryRes := tsdb.NewQueryResult()
+
+ body, err := ioutil.ReadAll(res.Body)
+ defer res.Body.Close()
+ if err != nil {
+ return nil, err
+ }
+
+ if res.StatusCode/100 != 2 {
+ plog.Info("Request failed", "status", res.Status, "body", string(body))
+ return nil, fmt.Errorf("Request failed status: %v", res.Status)
+ }
+
+ var data []OpenTsdbResponse
+ err = json.Unmarshal(body, &data)
+ if err != nil {
+ plog.Info("Failed to unmarshal opentsdb response", "error", err, "status", res.Status, "body", string(body))
+ return nil, err
+ }
+
+ for _, val := range data {
+ series := tsdb.TimeSeries{
+ Name: val.Metric,
+ }
+
+ for timeString, value := range val.DataPoints {
+ timestamp, err := strconv.ParseFloat(timeString, 64)
+ if err != nil {
+ plog.Info("Failed to unmarshal opentsdb timestamp", "timestamp", timeString)
+ return nil, err
+ }
+ series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(value), timestamp))
+ }
+
+ queryRes.Series = append(queryRes.Series, &series)
+ }
+
+ queryResults["A"] = queryRes
+ return queryResults, nil
+}
+
+func (e *OpenTsdbExecutor) buildMetric(query *tsdb.Query) map[string]interface{} {
+
+ metric := make(map[string]interface{})
+
+ // Setting metric and aggregator
+ metric["metric"] = query.Model.Get("metric").MustString()
+ metric["aggregator"] = query.Model.Get("aggregator").MustString()
+
+ // Setting downsampling options
+ disableDownsampling := query.Model.Get("disableDownsampling").MustBool()
+ if !disableDownsampling {
+ downsampleInterval := query.Model.Get("downsampleInterval").MustString()
+ if downsampleInterval == "" {
+ downsampleInterval = "1m" //default value for blank
+ }
+ downsample := downsampleInterval + "-" + query.Model.Get("downsampleAggregator").MustString()
+ if query.Model.Get("downsampleFillPolicy").MustString() != "none" {
+ metric["downsample"] = downsample + "-" + query.Model.Get("downsampleFillPolicy").MustString()
+ } else {
+ metric["downsample"] = downsample
+ }
+ }
+
+ // Setting rate options
+ if query.Model.Get("shouldComputeRate").MustBool() {
+
+ metric["rate"] = true
+ rateOptions := make(map[string]interface{})
+ rateOptions["counter"] = query.Model.Get("isCounter").MustBool()
+
+ counterMax, counterMaxCheck := query.Model.CheckGet("counterMax")
+ if counterMaxCheck {
+ rateOptions["counterMax"] = counterMax.MustFloat64()
+ }
+
+ resetValue, resetValueCheck := query.Model.CheckGet("counterResetValue")
+ if resetValueCheck {
+ rateOptions["resetValue"] = resetValue.MustFloat64()
+ }
+
+ metric["rateOptions"] = rateOptions
+ }
+
+ // Setting tags
+ tags, tagsCheck := query.Model.CheckGet("tags")
+ if tagsCheck && len(tags.MustMap()) > 0 {
+ metric["tags"] = tags.MustMap()
+ }
+
+ // Setting filters
+ filters, filtersCheck := query.Model.CheckGet("filters")
+ if filtersCheck && len(filters.MustArray()) > 0 {
+ metric["filters"] = filters.MustArray()
+ }
+
+ return metric
+
+}
diff --git a/pkg/tsdb/opentsdb/opentsdb_test.go b/pkg/tsdb/opentsdb/opentsdb_test.go
new file mode 100644
index 00000000000..094deb9e8ec
--- /dev/null
+++ b/pkg/tsdb/opentsdb/opentsdb_test.go
@@ -0,0 +1,176 @@
+package opentsdb
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/tsdb"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestOpenTsdbExecutor(t *testing.T) {
+ Convey("OpenTsdb query testing", t, func() {
+
+ exec := &OpenTsdbExecutor{}
+
+ Convey("Build metric with downsampling enabled", func() {
+
+ query := &tsdb.Query{
+ Model: simplejson.New(),
+ }
+
+ query.Model.Set("metric", "cpu.average.percent")
+ query.Model.Set("aggregator", "avg")
+ query.Model.Set("disableDownsampling", false)
+ query.Model.Set("downsampleInterval", "")
+ query.Model.Set("downsampleAggregator", "avg")
+ query.Model.Set("downsampleFillPolicy", "none")
+
+ metric := exec.buildMetric(query)
+
+ So(len(metric), ShouldEqual, 3)
+ So(metric["metric"], ShouldEqual, "cpu.average.percent")
+ So(metric["aggregator"], ShouldEqual, "avg")
+ So(metric["downsample"], ShouldEqual, "1m-avg")
+
+ })
+
+ Convey("Build metric with downsampling diabled", func() {
+
+ query := &tsdb.Query{
+ Model: simplejson.New(),
+ }
+
+ query.Model.Set("metric", "cpu.average.percent")
+ query.Model.Set("aggregator", "avg")
+ query.Model.Set("disableDownsampling", true)
+ query.Model.Set("downsampleInterval", "")
+ query.Model.Set("downsampleAggregator", "avg")
+ query.Model.Set("downsampleFillPolicy", "none")
+
+ metric := exec.buildMetric(query)
+
+ So(len(metric), ShouldEqual, 2)
+ So(metric["metric"], ShouldEqual, "cpu.average.percent")
+ So(metric["aggregator"], ShouldEqual, "avg")
+
+ })
+
+ Convey("Build metric with downsampling enabled with params", func() {
+
+ query := &tsdb.Query{
+ Model: simplejson.New(),
+ }
+
+ query.Model.Set("metric", "cpu.average.percent")
+ query.Model.Set("aggregator", "avg")
+ query.Model.Set("disableDownsampling", false)
+ query.Model.Set("downsampleInterval", "5m")
+ query.Model.Set("downsampleAggregator", "sum")
+ query.Model.Set("downsampleFillPolicy", "null")
+
+ metric := exec.buildMetric(query)
+
+ So(len(metric), ShouldEqual, 3)
+ So(metric["metric"], ShouldEqual, "cpu.average.percent")
+ So(metric["aggregator"], ShouldEqual, "avg")
+ So(metric["downsample"], ShouldEqual, "5m-sum-null")
+ })
+
+ Convey("Build metric with tags with downsampling disabled", func() {
+
+ query := &tsdb.Query{
+ Model: simplejson.New(),
+ }
+
+ query.Model.Set("metric", "cpu.average.percent")
+ query.Model.Set("aggregator", "avg")
+ query.Model.Set("disableDownsampling", true)
+ query.Model.Set("downsampleInterval", "5m")
+ query.Model.Set("downsampleAggregator", "sum")
+ query.Model.Set("downsampleFillPolicy", "null")
+
+ tags := simplejson.New()
+ tags.Set("env", "prod")
+ tags.Set("app", "grafana")
+ query.Model.Set("tags", tags.MustMap())
+
+ metric := exec.buildMetric(query)
+
+ So(len(metric), ShouldEqual, 3)
+ So(metric["metric"], ShouldEqual, "cpu.average.percent")
+ So(metric["aggregator"], ShouldEqual, "avg")
+ So(metric["downsample"], ShouldEqual, nil)
+ So(len(metric["tags"].(map[string]interface{})), ShouldEqual, 2)
+ So(metric["tags"].(map[string]interface{})["env"], ShouldEqual, "prod")
+ So(metric["tags"].(map[string]interface{})["app"], ShouldEqual, "grafana")
+ So(metric["tags"].(map[string]interface{})["ip"], ShouldEqual, nil)
+ })
+
+ Convey("Build metric with rate enabled but counter disabled", func() {
+
+ query := &tsdb.Query{
+ Model: simplejson.New(),
+ }
+
+ query.Model.Set("metric", "cpu.average.percent")
+ query.Model.Set("aggregator", "avg")
+ query.Model.Set("disableDownsampling", true)
+ query.Model.Set("shouldComputeRate", true)
+ query.Model.Set("isCounter", false)
+
+ tags := simplejson.New()
+ tags.Set("env", "prod")
+ tags.Set("app", "grafana")
+ query.Model.Set("tags", tags.MustMap())
+
+ metric := exec.buildMetric(query)
+
+ So(len(metric), ShouldEqual, 5)
+ So(metric["metric"], ShouldEqual, "cpu.average.percent")
+ So(metric["aggregator"], ShouldEqual, "avg")
+ So(len(metric["tags"].(map[string]interface{})), ShouldEqual, 2)
+ So(metric["tags"].(map[string]interface{})["env"], ShouldEqual, "prod")
+ So(metric["tags"].(map[string]interface{})["app"], ShouldEqual, "grafana")
+ So(metric["tags"].(map[string]interface{})["ip"], ShouldEqual, nil)
+ So(metric["rate"], ShouldEqual, true)
+ So(metric["rateOptions"].(map[string]interface{})["counter"], ShouldEqual, false)
+ })
+
+ Convey("Build metric with rate and counter enabled", func() {
+
+ query := &tsdb.Query{
+ Model: simplejson.New(),
+ }
+
+ query.Model.Set("metric", "cpu.average.percent")
+ query.Model.Set("aggregator", "avg")
+ query.Model.Set("disableDownsampling", true)
+ query.Model.Set("shouldComputeRate", true)
+ query.Model.Set("isCounter", true)
+ query.Model.Set("counterMax", 45)
+ query.Model.Set("counterResetValue", 60)
+
+ tags := simplejson.New()
+ tags.Set("env", "prod")
+ tags.Set("app", "grafana")
+ query.Model.Set("tags", tags.MustMap())
+
+ metric := exec.buildMetric(query)
+
+ So(len(metric), ShouldEqual, 5)
+ So(metric["metric"], ShouldEqual, "cpu.average.percent")
+ So(metric["aggregator"], ShouldEqual, "avg")
+ So(len(metric["tags"].(map[string]interface{})), ShouldEqual, 2)
+ So(metric["tags"].(map[string]interface{})["env"], ShouldEqual, "prod")
+ So(metric["tags"].(map[string]interface{})["app"], ShouldEqual, "grafana")
+ So(metric["tags"].(map[string]interface{})["ip"], ShouldEqual, nil)
+ So(metric["rate"], ShouldEqual, true)
+ So(len(metric["rateOptions"].(map[string]interface{})), ShouldEqual, 3)
+ So(metric["rateOptions"].(map[string]interface{})["counter"], ShouldEqual, true)
+ So(metric["rateOptions"].(map[string]interface{})["counterMax"], ShouldEqual, 45)
+ So(metric["rateOptions"].(map[string]interface{})["resetValue"], ShouldEqual, 60)
+ })
+
+ })
+}
diff --git a/pkg/tsdb/opentsdb/types.go b/pkg/tsdb/opentsdb/types.go
new file mode 100644
index 00000000000..752dee0fb3b
--- /dev/null
+++ b/pkg/tsdb/opentsdb/types.go
@@ -0,0 +1,12 @@
+package opentsdb
+
+type OpenTsdbQuery struct {
+ Start int64 `json:"start"`
+ End int64 `json:"end"`
+ Queries []map[string]interface{} `json:"queries"`
+}
+
+type OpenTsdbResponse struct {
+ Metric string `json:"metric"`
+ DataPoints map[string]float64 `json:"dps"`
+}
diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go
new file mode 100644
index 00000000000..c391f00920a
--- /dev/null
+++ b/pkg/tsdb/prometheus/prometheus.go
@@ -0,0 +1,172 @@
+package prometheus
+
+import (
+ "context"
+ "fmt"
+ "regexp"
+ "strings"
+ "time"
+
+ "gopkg.in/guregu/null.v3"
+
+ "net/http"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/tsdb"
+ "github.com/prometheus/client_golang/api/prometheus"
+ pmodel "github.com/prometheus/common/model"
+)
+
+type PrometheusExecutor struct {
+ *models.DataSource
+ Transport *http.Transport
+}
+
+func NewPrometheusExecutor(dsInfo *models.DataSource) (tsdb.Executor, error) {
+ transport, err := dsInfo.GetHttpTransport()
+ if err != nil {
+ return nil, err
+ }
+
+ return &PrometheusExecutor{
+ DataSource: dsInfo,
+ Transport: transport,
+ }, nil
+}
+
+var (
+ plog log.Logger
+ legendFormat *regexp.Regexp
+)
+
+func init() {
+ plog = log.New("tsdb.prometheus")
+ tsdb.RegisterExecutor("prometheus", NewPrometheusExecutor)
+ legendFormat = regexp.MustCompile(`\{\{\s*(.+?)\s*\}\}`)
+}
+
+func (e *PrometheusExecutor) getClient() (prometheus.QueryAPI, error) {
+ cfg := prometheus.Config{
+ Address: e.DataSource.Url,
+ Transport: e.Transport,
+ }
+
+ client, err := prometheus.New(cfg)
+ if err != nil {
+ return nil, err
+ }
+
+ return prometheus.NewQueryAPI(client), nil
+}
+
+func (e *PrometheusExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, queryContext *tsdb.QueryContext) *tsdb.BatchResult {
+ result := &tsdb.BatchResult{}
+
+ client, err := e.getClient()
+ if err != nil {
+ return result.WithError(err)
+ }
+
+ query, err := parseQuery(queries, queryContext)
+ if err != nil {
+ return result.WithError(err)
+ }
+
+ timeRange := prometheus.Range{
+ Start: query.Start,
+ End: query.End,
+ Step: query.Step,
+ }
+
+ value, err := client.QueryRange(ctx, query.Expr, timeRange)
+
+ if err != nil {
+ return result.WithError(err)
+ }
+
+ queryResult, err := parseResponse(value, query)
+ if err != nil {
+ return result.WithError(err)
+ }
+ result.QueryResults = queryResult
+ return result
+}
+
+func formatLegend(metric pmodel.Metric, query *PrometheusQuery) string {
+ if query.LegendFormat == "" {
+ return metric.String()
+ }
+
+ result := legendFormat.ReplaceAllFunc([]byte(query.LegendFormat), func(in []byte) []byte {
+ labelName := strings.Replace(string(in), "{{", "", 1)
+ labelName = strings.Replace(labelName, "}}", "", 1)
+ labelName = strings.TrimSpace(labelName)
+ if val, exists := metric[pmodel.LabelName(labelName)]; exists {
+ return []byte(val)
+ }
+
+ return in
+ })
+
+ return string(result)
+}
+
+func parseQuery(queries tsdb.QuerySlice, queryContext *tsdb.QueryContext) (*PrometheusQuery, error) {
+ queryModel := queries[0]
+
+ expr, err := queryModel.Model.Get("expr").String()
+ if err != nil {
+ return nil, err
+ }
+
+ step, err := queryModel.Model.Get("step").Int64()
+ if err != nil {
+ return nil, err
+ }
+
+ format := queryModel.Model.Get("legendFormat").MustString("")
+
+ start, err := queryContext.TimeRange.ParseFrom()
+ if err != nil {
+ return nil, err
+ }
+
+ end, err := queryContext.TimeRange.ParseTo()
+ if err != nil {
+ return nil, err
+ }
+
+ return &PrometheusQuery{
+ Expr: expr,
+ Step: time.Second * time.Duration(step),
+ LegendFormat: format,
+ Start: start,
+ End: end,
+ }, nil
+}
+
+func parseResponse(value pmodel.Value, query *PrometheusQuery) (map[string]*tsdb.QueryResult, error) {
+ queryResults := make(map[string]*tsdb.QueryResult)
+ queryRes := tsdb.NewQueryResult()
+
+ data, ok := value.(pmodel.Matrix)
+ if !ok {
+ return queryResults, fmt.Errorf("Unsupported result format: %s", value.Type().String())
+ }
+
+ for _, v := range data {
+ series := tsdb.TimeSeries{
+ Name: formatLegend(v.Metric, query),
+ }
+
+ for _, k := range v.Values {
+ series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(float64(k.Value)), float64(k.Timestamp.Unix()*1000)))
+ }
+
+ queryRes.Series = append(queryRes.Series, &series)
+ }
+
+ queryResults["A"] = queryRes
+ return queryResults, nil
+}
diff --git a/pkg/tsdb/prometheus/prometheus_test.go b/pkg/tsdb/prometheus/prometheus_test.go
new file mode 100644
index 00000000000..d66ef75e479
--- /dev/null
+++ b/pkg/tsdb/prometheus/prometheus_test.go
@@ -0,0 +1,40 @@
+package prometheus
+
+import (
+ "testing"
+
+ p "github.com/prometheus/common/model"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestPrometheus(t *testing.T) {
+ Convey("Prometheus", t, func() {
+
+ Convey("converting metric name", func() {
+ metric := map[p.LabelName]p.LabelValue{
+ p.LabelName("app"): p.LabelValue("backend"),
+ p.LabelName("device"): p.LabelValue("mobile"),
+ }
+
+ query := &PrometheusQuery{
+ LegendFormat: "legend {{app}} {{ device }} {{broken}}",
+ }
+
+ So(formatLegend(metric, query), ShouldEqual, "legend backend mobile {{broken}}")
+ })
+
+ Convey("build full serie name", func() {
+ metric := map[p.LabelName]p.LabelValue{
+ p.LabelName(p.MetricNameLabel): p.LabelValue("http_request_total"),
+ p.LabelName("app"): p.LabelValue("backend"),
+ p.LabelName("device"): p.LabelValue("mobile"),
+ }
+
+ query := &PrometheusQuery{
+ LegendFormat: "",
+ }
+
+ So(formatLegend(metric, query), ShouldEqual, `http_request_total{app="backend", device="mobile"}`)
+ })
+ })
+}
diff --git a/pkg/tsdb/prometheus/types.go b/pkg/tsdb/prometheus/types.go
new file mode 100644
index 00000000000..8ed665d0123
--- /dev/null
+++ b/pkg/tsdb/prometheus/types.go
@@ -0,0 +1,11 @@
+package prometheus
+
+import "time"
+
+type PrometheusQuery struct {
+ Expr string
+ Step time.Duration
+ LegendFormat string
+ Start time.Time
+ End time.Time
+}
diff --git a/pkg/tsdb/query_context.go b/pkg/tsdb/query_context.go
new file mode 100644
index 00000000000..db40ba6253c
--- /dev/null
+++ b/pkg/tsdb/query_context.go
@@ -0,0 +1,21 @@
+package tsdb
+
+import "sync"
+
+type QueryContext struct {
+ TimeRange *TimeRange
+ Queries QuerySlice
+ Results map[string]*QueryResult
+ ResultsChan chan *BatchResult
+ Lock sync.RWMutex
+ BatchWaits sync.WaitGroup
+}
+
+func NewQueryContext(queries QuerySlice, timeRange *TimeRange) *QueryContext {
+ return &QueryContext{
+ TimeRange: timeRange,
+ Queries: queries,
+ ResultsChan: make(chan *BatchResult),
+ Results: make(map[string]*QueryResult),
+ }
+}
diff --git a/pkg/tsdb/request.go b/pkg/tsdb/request.go
new file mode 100644
index 00000000000..2934443bc53
--- /dev/null
+++ b/pkg/tsdb/request.go
@@ -0,0 +1,61 @@
+package tsdb
+
+import "context"
+
+type HandleRequestFunc func(ctx context.Context, req *Request) (*Response, error)
+
+func HandleRequest(ctx context.Context, req *Request) (*Response, error) {
+ context := NewQueryContext(req.Queries, req.TimeRange)
+
+ batches, err := getBatches(req)
+ if err != nil {
+ return nil, err
+ }
+
+ currentlyExecuting := 0
+
+ for _, batch := range batches {
+ if len(batch.Depends) == 0 {
+ currentlyExecuting += 1
+ batch.Started = true
+ go batch.process(ctx, context)
+ }
+ }
+
+ response := &Response{}
+
+ for currentlyExecuting != 0 {
+ select {
+ case batchResult := <-context.ResultsChan:
+ currentlyExecuting -= 1
+
+ response.BatchTimings = append(response.BatchTimings, batchResult.Timings)
+
+ if batchResult.Error != nil {
+ return nil, batchResult.Error
+ }
+
+ for refId, result := range batchResult.QueryResults {
+ context.Results[refId] = result
+ }
+
+ for _, batch := range batches {
+ // not interested in started batches
+ if batch.Started {
+ continue
+ }
+
+ if batch.allDependenciesAreIn(context) {
+ currentlyExecuting += 1
+ batch.Started = true
+ go batch.process(ctx, context)
+ }
+ }
+ case <-ctx.Done():
+ return nil, ctx.Err()
+ }
+ }
+
+ response.Results = context.Results
+ return response, nil
+}
diff --git a/pkg/tsdb/testdata/scenarios.go b/pkg/tsdb/testdata/scenarios.go
new file mode 100644
index 00000000000..667b7fffcba
--- /dev/null
+++ b/pkg/tsdb/testdata/scenarios.go
@@ -0,0 +1,137 @@
+package testdata
+
+import (
+ "math/rand"
+ "strconv"
+ "strings"
+ "time"
+
+ "gopkg.in/guregu/null.v3"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/tsdb"
+)
+
+type ScenarioHandler func(query *tsdb.Query, context *tsdb.QueryContext) *tsdb.QueryResult
+
+type Scenario struct {
+ Id string `json:"id"`
+ Name string `json:"name"`
+ StringInput string `json:"stringOption"`
+ Description string `json:"description"`
+ Handler ScenarioHandler `json:"-"`
+}
+
+var ScenarioRegistry map[string]*Scenario
+
+func init() {
+ ScenarioRegistry = make(map[string]*Scenario)
+ logger := log.New("tsdb.testdata")
+
+ logger.Debug("Initializing TestData Scenario")
+
+ registerScenario(&Scenario{
+ Id: "random_walk",
+ Name: "Random Walk",
+
+ Handler: func(query *tsdb.Query, context *tsdb.QueryContext) *tsdb.QueryResult {
+ timeWalkerMs := context.TimeRange.GetFromAsMsEpoch()
+ to := context.TimeRange.GetToAsMsEpoch()
+
+ series := newSeriesForQuery(query)
+
+ points := make(tsdb.TimeSeriesPoints, 0)
+ walker := rand.Float64() * 100
+
+ for i := int64(0); i < 10000 && timeWalkerMs < to; i++ {
+ points = append(points, tsdb.NewTimePoint(null.FloatFrom(walker), float64(timeWalkerMs)))
+
+ walker += rand.Float64() - 0.5
+ timeWalkerMs += query.IntervalMs
+ }
+
+ series.Points = points
+
+ queryRes := tsdb.NewQueryResult()
+ queryRes.Series = append(queryRes.Series, series)
+ return queryRes
+ },
+ })
+
+ registerScenario(&Scenario{
+ Id: "no_data_points",
+ Name: "No Data Points",
+ Handler: func(query *tsdb.Query, context *tsdb.QueryContext) *tsdb.QueryResult {
+ return tsdb.NewQueryResult()
+ },
+ })
+
+ registerScenario(&Scenario{
+ Id: "datapoints_outside_range",
+ Name: "Datapoints Outside Range",
+ Handler: func(query *tsdb.Query, context *tsdb.QueryContext) *tsdb.QueryResult {
+ queryRes := tsdb.NewQueryResult()
+
+ series := newSeriesForQuery(query)
+ outsideTime := context.TimeRange.MustGetFrom().Add(-1*time.Hour).Unix() * 1000
+
+ series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(10), float64(outsideTime)))
+ queryRes.Series = append(queryRes.Series, series)
+
+ return queryRes
+ },
+ })
+
+ registerScenario(&Scenario{
+ Id: "csv_metric_values",
+ Name: "CSV Metric Values",
+ StringInput: "1,20,90,30,5,0",
+ Handler: func(query *tsdb.Query, context *tsdb.QueryContext) *tsdb.QueryResult {
+ queryRes := tsdb.NewQueryResult()
+
+ stringInput := query.Model.Get("stringInput").MustString()
+ stringInput = strings.Replace(stringInput, " ", "", -1)
+
+ values := []null.Float{}
+ for _, strVal := range strings.Split(stringInput, ",") {
+ if strVal == "null" {
+ values = append(values, null.FloatFromPtr(nil))
+ }
+ if val, err := strconv.ParseFloat(strVal, 64); err == nil {
+ values = append(values, null.FloatFrom(val))
+ }
+ }
+
+ if len(values) == 0 {
+ return queryRes
+ }
+
+ series := newSeriesForQuery(query)
+ startTime := context.TimeRange.GetFromAsMsEpoch()
+ endTime := context.TimeRange.GetToAsMsEpoch()
+ step := (endTime - startTime) / int64(len(values)-1)
+
+ for _, val := range values {
+ series.Points = append(series.Points, tsdb.TimePoint{val, null.FloatFrom(float64(startTime))})
+ startTime += step
+ }
+
+ queryRes.Series = append(queryRes.Series, series)
+
+ return queryRes
+ },
+ })
+}
+
+func registerScenario(scenario *Scenario) {
+ ScenarioRegistry[scenario.Id] = scenario
+}
+
+func newSeriesForQuery(query *tsdb.Query) *tsdb.TimeSeries {
+ alias := query.Model.Get("alias").MustString("")
+ if alias == "" {
+ alias = query.RefId + "-series"
+ }
+
+ return &tsdb.TimeSeries{Name: alias}
+}
diff --git a/pkg/tsdb/testdata/testdata.go b/pkg/tsdb/testdata/testdata.go
new file mode 100644
index 00000000000..6aefd8686d8
--- /dev/null
+++ b/pkg/tsdb/testdata/testdata.go
@@ -0,0 +1,42 @@
+package testdata
+
+import (
+ "context"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/tsdb"
+)
+
+type TestDataExecutor struct {
+ *models.DataSource
+ log log.Logger
+}
+
+func NewTestDataExecutor(dsInfo *models.DataSource) (tsdb.Executor, error) {
+ return &TestDataExecutor{
+ DataSource: dsInfo,
+ log: log.New("tsdb.testdata"),
+ }, nil
+}
+
+func init() {
+ tsdb.RegisterExecutor("grafana-testdata-datasource", NewTestDataExecutor)
+}
+
+func (e *TestDataExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, context *tsdb.QueryContext) *tsdb.BatchResult {
+ result := &tsdb.BatchResult{}
+ result.QueryResults = make(map[string]*tsdb.QueryResult)
+
+ for _, query := range queries {
+ scenarioId := query.Model.Get("scenarioId").MustString("random_walk")
+ if scenario, exist := ScenarioRegistry[scenarioId]; exist {
+ result.QueryResults[query.RefId] = scenario.Handler(query, context)
+ result.QueryResults[query.RefId].RefId = query.RefId
+ } else {
+ e.log.Error("Scenario not found", "scenarioId", scenarioId)
+ }
+ }
+
+ return result
+}
diff --git a/pkg/tsdb/time_range.go b/pkg/tsdb/time_range.go
new file mode 100644
index 00000000000..cf6bc6a5048
--- /dev/null
+++ b/pkg/tsdb/time_range.go
@@ -0,0 +1,90 @@
+package tsdb
+
+import (
+ "fmt"
+ "strconv"
+ "strings"
+ "time"
+)
+
+func NewTimeRange(from, to string) *TimeRange {
+ return &TimeRange{
+ From: from,
+ To: to,
+ Now: time.Now(),
+ }
+}
+
+type TimeRange struct {
+ From string
+ To string
+ Now time.Time
+}
+
+func (tr *TimeRange) GetFromAsMsEpoch() int64 {
+ return tr.MustGetFrom().UnixNano() / int64(time.Millisecond)
+}
+
+func (tr *TimeRange) GetToAsMsEpoch() int64 {
+ return tr.MustGetTo().UnixNano() / int64(time.Millisecond)
+}
+
+func (tr *TimeRange) MustGetFrom() time.Time {
+ if res, err := tr.ParseFrom(); err != nil {
+ return time.Unix(0, 0)
+ } else {
+ return res
+ }
+}
+
+func (tr *TimeRange) MustGetTo() time.Time {
+ if res, err := tr.ParseTo(); err != nil {
+ return time.Unix(0, 0)
+ } else {
+ return res
+ }
+}
+
+func tryParseUnixMsEpoch(val string) (time.Time, bool) {
+ if val, err := strconv.ParseInt(val, 10, 64); err == nil {
+ seconds := val / 1000
+ nano := (val - seconds*1000) * 1000000
+ return time.Unix(seconds, nano), true
+ }
+ return time.Time{}, false
+}
+
+func (tr *TimeRange) ParseFrom() (time.Time, error) {
+ if res, ok := tryParseUnixMsEpoch(tr.From); ok {
+ return res, nil
+ }
+
+ fromRaw := strings.Replace(tr.From, "now-", "", 1)
+ diff, err := time.ParseDuration("-" + fromRaw)
+ if err != nil {
+ return time.Time{}, err
+ }
+
+ return tr.Now.Add(diff), nil
+}
+
+func (tr *TimeRange) ParseTo() (time.Time, error) {
+ if tr.To == "now" {
+ return tr.Now, nil
+ } else if strings.HasPrefix(tr.To, "now-") {
+ withoutNow := strings.Replace(tr.To, "now-", "", 1)
+
+ diff, err := time.ParseDuration("-" + withoutNow)
+ if err != nil {
+ return time.Time{}, nil
+ }
+
+ return tr.Now.Add(diff), nil
+ }
+
+ if res, ok := tryParseUnixMsEpoch(tr.To); ok {
+ return res, nil
+ }
+
+ return time.Time{}, fmt.Errorf("cannot parse to value %s", tr.To)
+}
diff --git a/pkg/tsdb/time_range_test.go b/pkg/tsdb/time_range_test.go
new file mode 100644
index 00000000000..5412d0d05f3
--- /dev/null
+++ b/pkg/tsdb/time_range_test.go
@@ -0,0 +1,95 @@
+package tsdb
+
+import (
+ "testing"
+ "time"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestTimeRange(t *testing.T) {
+ Convey("Time range", t, func() {
+
+ now := time.Now()
+
+ Convey("Can parse 5m, now", func() {
+ tr := TimeRange{
+ From: "5m",
+ To: "now",
+ Now: now,
+ }
+
+ Convey("5m ago ", func() {
+ fiveMinAgo, _ := time.ParseDuration("-5m")
+ expected := now.Add(fiveMinAgo)
+
+ res, err := tr.ParseFrom()
+ So(err, ShouldBeNil)
+ So(res.Unix(), ShouldEqual, expected.Unix())
+ })
+
+ Convey("now ", func() {
+ res, err := tr.ParseTo()
+ So(err, ShouldBeNil)
+ So(res.Unix(), ShouldEqual, now.Unix())
+ })
+ })
+
+ Convey("Can parse 5h, now-10m", func() {
+ tr := TimeRange{
+ From: "5h",
+ To: "now-10m",
+ Now: now,
+ }
+
+ Convey("5h ago ", func() {
+ fiveHourAgo, _ := time.ParseDuration("-5h")
+ expected := now.Add(fiveHourAgo)
+
+ res, err := tr.ParseFrom()
+ So(err, ShouldBeNil)
+ So(res.Unix(), ShouldEqual, expected.Unix())
+ })
+
+ Convey("now-10m ", func() {
+ fiveMinAgo, _ := time.ParseDuration("-10m")
+ expected := now.Add(fiveMinAgo)
+ res, err := tr.ParseTo()
+ So(err, ShouldBeNil)
+ So(res.Unix(), ShouldEqual, expected.Unix())
+ })
+ })
+
+ Convey("can parse unix epocs", func() {
+ var err error
+ tr := TimeRange{
+ From: "1474973725473",
+ To: "1474975757930",
+ Now: now,
+ }
+
+ res, err := tr.ParseFrom()
+ So(err, ShouldBeNil)
+ So(res.UnixNano()/int64(time.Millisecond), ShouldEqual, 1474973725473)
+
+ res, err = tr.ParseTo()
+ So(err, ShouldBeNil)
+ So(res.UnixNano()/int64(time.Millisecond), ShouldEqual, 1474975757930)
+ })
+
+ Convey("Cannot parse asdf", func() {
+ var err error
+ tr := TimeRange{
+ From: "asdf",
+ To: "asdf",
+ Now: now,
+ }
+
+ _, err = tr.ParseFrom()
+ So(err, ShouldNotBeNil)
+
+ _, err = tr.ParseTo()
+ So(err, ShouldNotBeNil)
+ })
+ })
+}
diff --git a/pkg/tsdb/tsdb_test.go b/pkg/tsdb/tsdb_test.go
new file mode 100644
index 00000000000..2b1a2372cd6
--- /dev/null
+++ b/pkg/tsdb/tsdb_test.go
@@ -0,0 +1,177 @@
+package tsdb
+
+import (
+ "context"
+ "testing"
+ "time"
+
+ "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestMetricQuery(t *testing.T) {
+
+ Convey("When batches groups for query", t, func() {
+
+ Convey("Given 3 queries for 2 data sources", func() {
+ request := &Request{
+ Queries: QuerySlice{
+ {RefId: "A", DataSource: &models.DataSource{Id: 1}},
+ {RefId: "B", DataSource: &models.DataSource{Id: 1}},
+ {RefId: "C", DataSource: &models.DataSource{Id: 2}},
+ },
+ }
+
+ batches, err := getBatches(request)
+ So(err, ShouldBeNil)
+
+ Convey("Should group into two batches", func() {
+ So(len(batches), ShouldEqual, 2)
+ })
+ })
+
+ Convey("Given query 2 depends on query 1", func() {
+ request := &Request{
+ Queries: QuerySlice{
+ {RefId: "A", DataSource: &models.DataSource{Id: 1}},
+ {RefId: "B", DataSource: &models.DataSource{Id: 2}},
+ {RefId: "C", DataSource: &models.DataSource{Id: 3}, Depends: []string{"A", "B"}},
+ },
+ }
+
+ batches, err := getBatches(request)
+ So(err, ShouldBeNil)
+
+ Convey("Should return three batch groups", func() {
+ So(len(batches), ShouldEqual, 3)
+ })
+
+ Convey("Group 3 should have group 1 and 2 as dependencies", func() {
+ So(batches[2].Depends["A"], ShouldEqual, true)
+ So(batches[2].Depends["B"], ShouldEqual, true)
+ })
+
+ })
+ })
+
+ Convey("When executing request with one query", t, func() {
+ req := &Request{
+ Queries: QuerySlice{
+ {RefId: "A", DataSource: &models.DataSource{Id: 1, Type: "test"}},
+ },
+ }
+
+ fakeExecutor := registerFakeExecutor()
+ fakeExecutor.Return("A", TimeSeriesSlice{&TimeSeries{Name: "argh"}})
+
+ res, err := HandleRequest(context.TODO(), req)
+ So(err, ShouldBeNil)
+
+ Convey("Should return query results", func() {
+ So(res.Results["A"].Series, ShouldNotBeEmpty)
+ So(res.Results["A"].Series[0].Name, ShouldEqual, "argh")
+ })
+ })
+
+ Convey("When executing one request with two queries from same data source", t, func() {
+ req := &Request{
+ Queries: QuerySlice{
+ {RefId: "A", DataSource: &models.DataSource{Id: 1, Type: "test"}},
+ {RefId: "B", DataSource: &models.DataSource{Id: 1, Type: "test"}},
+ },
+ }
+
+ fakeExecutor := registerFakeExecutor()
+ fakeExecutor.Return("A", TimeSeriesSlice{&TimeSeries{Name: "argh"}})
+ fakeExecutor.Return("B", TimeSeriesSlice{&TimeSeries{Name: "barg"}})
+
+ res, err := HandleRequest(context.TODO(), req)
+ So(err, ShouldBeNil)
+
+ Convey("Should return query results", func() {
+ So(len(res.Results), ShouldEqual, 2)
+ So(res.Results["B"].Series[0].Name, ShouldEqual, "barg")
+ })
+
+ Convey("Should have been batched in one request", func() {
+ So(len(res.BatchTimings), ShouldEqual, 1)
+ })
+
+ })
+
+ Convey("When executing one request with three queries from different datasources", t, func() {
+ req := &Request{
+ Queries: QuerySlice{
+ {RefId: "A", DataSource: &models.DataSource{Id: 1, Type: "test"}},
+ {RefId: "B", DataSource: &models.DataSource{Id: 1, Type: "test"}},
+ {RefId: "C", DataSource: &models.DataSource{Id: 2, Type: "test"}},
+ },
+ }
+
+ res, err := HandleRequest(context.TODO(), req)
+ So(err, ShouldBeNil)
+
+ Convey("Should have been batched in two requests", func() {
+ So(len(res.BatchTimings), ShouldEqual, 2)
+ })
+ })
+
+ Convey("When query uses data source of unknown type", t, func() {
+ req := &Request{
+ Queries: QuerySlice{
+ {RefId: "A", DataSource: &models.DataSource{Id: 1, Type: "asdasdas"}},
+ },
+ }
+
+ _, err := HandleRequest(context.TODO(), req)
+ So(err, ShouldNotBeNil)
+ })
+
+ Convey("When executing request that depend on other query", t, func() {
+ req := &Request{
+ Queries: QuerySlice{
+ {
+ RefId: "A", DataSource: &models.DataSource{Id: 1, Type: "test"},
+ },
+ {
+ RefId: "B", DataSource: &models.DataSource{Id: 2, Type: "test"}, Depends: []string{"A"},
+ },
+ },
+ }
+
+ fakeExecutor := registerFakeExecutor()
+ fakeExecutor.HandleQuery("A", func(c *QueryContext) *QueryResult {
+ time.Sleep(10 * time.Millisecond)
+ return &QueryResult{
+ Series: TimeSeriesSlice{
+ &TimeSeries{Name: "Ares"},
+ }}
+ })
+ fakeExecutor.HandleQuery("B", func(c *QueryContext) *QueryResult {
+ return &QueryResult{
+ Series: TimeSeriesSlice{
+ &TimeSeries{Name: "Bres+" + c.Results["A"].Series[0].Name},
+ }}
+ })
+
+ res, err := HandleRequest(context.TODO(), req)
+ So(err, ShouldBeNil)
+
+ Convey("Should have been batched in two requests", func() {
+ So(len(res.BatchTimings), ShouldEqual, 2)
+ })
+
+ Convey("Query B should have access to Query A results", func() {
+ So(res.Results["B"].Series[0].Name, ShouldEqual, "Bres+Ares")
+ })
+ })
+}
+
+func registerFakeExecutor() *FakeExecutor {
+ executor, _ := NewFakeExecutor(nil)
+ RegisterExecutor("test", func(dsInfo *models.DataSource) (Executor, error) {
+ return executor, nil
+ })
+
+ return executor
+}
diff --git a/pkg/util/strings.go b/pkg/util/strings.go
index 7e503a99118..8598949c2cb 100644
--- a/pkg/util/strings.go
+++ b/pkg/util/strings.go
@@ -1,18 +1,18 @@
package util
func StringsFallback2(val1 string, val2 string) string {
- if val1 != "" {
- return val1
- }
- return val2
+ return stringsFallback(val1, val2)
}
func StringsFallback3(val1 string, val2 string, val3 string) string {
- if val1 != "" {
- return val1
+ return stringsFallback(val1, val2, val3)
+}
+
+func stringsFallback(vals ...string) string {
+ for _, v := range vals {
+ if v != "" {
+ return v
+ }
}
- if val2 != "" {
- return val2
- }
- return val3
+ return ""
}
diff --git a/pkg/util/strings_test.go b/pkg/util/strings_test.go
new file mode 100644
index 00000000000..c959dfd1d54
--- /dev/null
+++ b/pkg/util/strings_test.go
@@ -0,0 +1,15 @@
+package util
+
+import (
+ "testing"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestStringsUtil(t *testing.T) {
+ Convey("Falling back until none empty string", t, func() {
+ So(StringsFallback2("1", "2"), ShouldEqual, "1")
+ So(StringsFallback2("", "2"), ShouldEqual, "2")
+ So(StringsFallback3("", "", "3"), ShouldEqual, "3")
+ })
+}
diff --git a/public/app/app.ts b/public/app/app.ts
index b30b75a0ca3..22431a5110c 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -14,6 +14,7 @@ import $ from 'jquery';
import angular from 'angular';
import config from 'app/core/config';
import _ from 'lodash';
+import moment from 'moment';
import {coreModule} from './core/core';
export class GrafanaApp {
@@ -39,9 +40,17 @@ export class GrafanaApp {
init() {
var app = angular.module('grafana', []);
- app.constant('grafanaVersion', "@grafanaVersion@");
- app.config(($locationProvider, $controllerProvider, $compileProvider, $filterProvider, $provide) => {
+ moment.locale(config.bootData.user.locale);
+
+ app.config(($locationProvider, $controllerProvider, $compileProvider, $filterProvider, $httpProvider, $provide) => {
+
+ if (config.buildInfo.env !== 'development') {
+ $compileProvider.debugInfoEnabled(false);
+ }
+
+ $httpProvider.useApplyAsync(true);
+
this.registerFunctions.controller = $controllerProvider.register;
this.registerFunctions.directive = $compileProvider.directive;
this.registerFunctions.factory = $provide.factory;
diff --git a/public/app/core/components/colorpicker.ts b/public/app/core/components/colorpicker.ts
index 7c35ac7e4ac..1834a1eb8a1 100644
--- a/public/app/core/components/colorpicker.ts
+++ b/public/app/core/components/colorpicker.ts
@@ -7,10 +7,6 @@ import coreModule from 'app/core/core_module';
var template = `
-
-
-
Y Axis:
-
`;
@@ -51,21 +46,17 @@ export class ColorPickerCtrl {
toggleAxis(yaxis) {
this.$scope.toggleAxis();
- if (!this.$scope.autoClose) {
+ if (this.$scope.autoClose) {
this.$scope.dismiss();
}
}
colorSelected(color) {
this.$scope.colorSelected(color);
- if (!this.$scope.autoClose) {
+ if (this.$scope.autoClose) {
this.$scope.dismiss();
}
}
-
- close() {
- this.$scope.dismiss();
- }
}
export function colorPicker() {
diff --git a/public/app/core/components/dashboard_selector.ts b/public/app/core/components/dashboard_selector.ts
new file mode 100644
index 00000000000..4209ff3f8dc
--- /dev/null
+++ b/public/app/core/components/dashboard_selector.ts
@@ -0,0 +1,47 @@
+///
+
+import config from 'app/core/config';
+import _ from 'lodash';
+import $ from 'jquery';
+import coreModule from 'app/core/core_module';
+
+var template = `
+
+
+ Not finding dashboard you want? Star it first, then it should appear in this select box.
+
+`;
+
+export class DashboardSelectorCtrl {
+ model: any;
+ options: any;
+
+ /** @ngInject */
+ constructor(private backendSrv) {
+ }
+
+ $onInit() {
+ this.options = [{value: 0, text: 'Default'}];
+
+ return this.backendSrv.search({starred: true}).then(res => {
+ res.forEach(dash => {
+ this.options.push({value: dash.id, text: dash.title});
+ });
+ });
+ }
+}
+
+export function dashboardSelector() {
+ return {
+ restrict: 'E',
+ controller: DashboardSelectorCtrl,
+ bindToController: true,
+ controllerAs: 'ctrl',
+ template: template,
+ scope: {
+ model: '='
+ }
+ };
+}
+
+coreModule.directive('dashboardSelector', dashboardSelector);
diff --git a/public/app/core/components/grafana_app.ts b/public/app/core/components/grafana_app.ts
index 0a2e49e5d72..83b55ac476f 100644
--- a/public/app/core/components/grafana_app.ts
+++ b/public/app/core/components/grafana_app.ts
@@ -5,7 +5,10 @@ import store from 'app/core/store';
import _ from 'lodash';
import angular from 'angular';
import $ from 'jquery';
+
import coreModule from 'app/core/core_module';
+import {profiler} from 'app/core/profiler';
+import appEvents from 'app/core/app_events';
export class GrafanaCtrl {
@@ -15,14 +18,10 @@ export class GrafanaCtrl {
$scope.init = function() {
$scope.contextSrv = contextSrv;
+ $rootScope.appSubUrl = config.appSubUrl;
$scope._ = _;
- $rootScope.profilingEnabled = store.getBool('profilingEnabled');
- $rootScope.performance = { loadStart: new Date().getTime() };
- $rootScope.appSubUrl = config.appSubUrl;
-
- if ($rootScope.profilingEnabled) { $scope.initProfiling(); }
-
+ profiler.init(config, $rootScope);
alertSrv.init();
utilSrv.init();
@@ -30,6 +29,7 @@ export class GrafanaCtrl {
};
$scope.initDashboard = function(dashboardData, viewScope) {
+ $scope.appEvent("dashboard-fetch-end", dashboardData);
$controller('DashboardCtrl', { $scope: viewScope }).init(dashboardData);
};
@@ -47,6 +47,7 @@ export class GrafanaCtrl {
$rootScope.appEvent = function(name, payload) {
$rootScope.$emit(name, payload);
+ appEvents.emit(name, payload);
};
$rootScope.colors = [
@@ -59,82 +60,6 @@ export class GrafanaCtrl {
"#E0F9D7","#FCEACA","#CFFAFF","#F9E2D2","#FCE2DE","#BADFF4","#F9D9F9","#DEDAF7"
];
- $scope.getTotalWatcherCount = function() {
- var count = 0;
- var scopes = 0;
- var root = $(document.getElementsByTagName('body'));
-
- var f = function (element) {
- if (element.data().hasOwnProperty('$scope')) {
- scopes++;
- angular.forEach(element.data().$scope.$$watchers, function () {
- count++;
- });
- }
-
- angular.forEach(element.children(), function (childElement) {
- f($(childElement));
- });
- };
-
- f(root);
- $rootScope.performance.scopeCount = scopes;
- return count;
- };
-
- $scope.initProfiling = function() {
- var count = 0;
-
- $scope.$watch(function digestCounter() {
- count++;
- }, function() {
- // something
- });
-
- $rootScope.performance.panels = [];
-
- $scope.$on('refresh', function() {
- if ($rootScope.performance.panels.length > 0) {
- var totalRender = 0;
- var totalQuery = 0;
-
- _.each($rootScope.performance.panels, function(panelTiming: any) {
- totalRender += panelTiming.render;
- totalQuery += panelTiming.query;
- });
-
- console.log('total query: ' + totalQuery);
- console.log('total render: ' + totalRender);
- console.log('avg render: ' + totalRender / $rootScope.performance.panels.length);
- }
-
- $rootScope.performance.panels = [];
- });
-
- $scope.onAppEvent('dashboard-loaded', function() {
- count = 0;
-
- setTimeout(function() {
- console.log("Dashboard::Performance Total Digests: " + count);
- console.log("Dashboard::Performance Total Watchers: " + $scope.getTotalWatcherCount());
- console.log("Dashboard::Performance Total ScopeCount: " + $rootScope.performance.scopeCount);
-
- var timeTaken = $rootScope.performance.allPanelsInitialized - $rootScope.performance.dashboardLoadStart;
- console.log("Dashboard::Performance - All panels initialized in " + timeTaken + " ms");
-
- // measure digest performance
- var rootDigestStart = window.performance.now();
- for (var i = 0; i < 30; i++) {
- $rootScope.$apply();
- }
- console.log("Dashboard::Performance Root Digest " + ((window.performance.now() - rootDigestStart) / 30));
-
- }, 3000);
-
- });
-
- };
-
$scope.init();
}
}
@@ -182,6 +107,58 @@ export function grafanaAppDirective(playlistSrv, contextSrv) {
body.addClass(pageClass);
}
$("#tooltip, .tooltip").remove();
+
+ // check for kiosk url param
+ if (data.params.kiosk) {
+ appEvents.emit('toggle-kiosk-mode');
+ }
+ });
+
+ // handle kiosk mode
+ appEvents.on('toggle-kiosk-mode', () => {
+ body.toggleClass('page-kiosk-mode');
+ });
+
+ // handle in active view state class
+ var lastActivity = new Date().getTime();
+ var activeUser = true;
+ var inActiveTimeLimit = 60 * 1000;
+
+ function checkForInActiveUser() {
+ if (!activeUser) {
+ return;
+ }
+ // only go to activity low mode on dashboard page
+ if (!body.hasClass('page-dashboard')) {
+ return;
+ }
+
+ if ((new Date().getTime() - lastActivity) > inActiveTimeLimit) {
+ activeUser = false;
+ body.addClass('user-activity-low');
+ }
+ }
+
+ function userActivityDetected() {
+ lastActivity = new Date().getTime();
+ if (!activeUser) {
+ activeUser = true;
+ body.removeClass('user-activity-low');
+ }
+ }
+
+ // mouse and keyboard is user activity
+ body.mousemove(userActivityDetected);
+ body.keydown(userActivityDetected);
+ // treat tab change as activity
+ document.addEventListener('visibilitychange', userActivityDetected);
+
+ // check every 2 seconds
+ setInterval(checkForInActiveUser, 2000);
+
+ appEvents.on('toggle-view-mode', () => {
+ lastActivity = 0;
+ checkForInActiveUser();
});
// handle document clicks that should hide things
@@ -191,6 +168,17 @@ export function grafanaAppDirective(playlistSrv, contextSrv) {
return;
}
+ // for stuff that animates, slides out etc, clicking it needs to
+ // hide it right away
+ var clickAutoHide = target.closest('[data-click-hide]');
+ if (clickAutoHide.length) {
+ var clickAutoHideParent = clickAutoHide.parent();
+ clickAutoHide.detach();
+ setTimeout(function() {
+ clickAutoHideParent.append(clickAutoHide);
+ }, 100);
+ }
+
if (target.parents('.dash-playlist-actions').length === 0) {
playlistSrv.stop();
}
diff --git a/public/app/core/components/help/help.html b/public/app/core/components/help/help.html
new file mode 100644
index 00000000000..3356f21d452
--- /dev/null
+++ b/public/app/core/components/help/help.html
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+ mod =
+ CTRL on windows or linux and CMD key on Mac
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{shortcut.description}}
+
+
+
+
+
+
+
+
+
diff --git a/public/app/core/components/help/help.ts b/public/app/core/components/help/help.ts
new file mode 100644
index 00000000000..3bc9b57077a
--- /dev/null
+++ b/public/app/core/components/help/help.ts
@@ -0,0 +1,66 @@
+///
+
+import coreModule from '../../core_module';
+import appEvents from 'app/core/app_events';
+
+export class HelpCtrl {
+ tabIndex: any;
+ shortcuts: any;
+
+ /** @ngInject */
+ constructor(private $scope, $sce) {
+ this.tabIndex = 0;
+ this.shortcuts = {
+ 'Global': [
+ {keys: ['g', 'h'], description: 'Go to Home Dashboard'},
+ {keys: ['g', 'p'], description: 'Go to Profile'},
+ {keys: ['s', 'o'], description: 'Open search'},
+ {keys: ['s', 's'], description: 'Open search with starred filter'},
+ {keys: ['s', 't'], description: 'Open search in tags view'},
+ {keys: ['esc'], description: 'Exit edit/setting views'},
+ ],
+ 'Dashboard': [
+ {keys: ['mod+s'], description: 'Save dashboard'},
+ {keys: ['mod+h'], description: 'Hide row controls'},
+ {keys: ['d', 'r'], description: 'Refresh all panels'},
+ {keys: ['d', 's'], description: 'Dashboard settings'},
+ {keys: ['d', 'v'], description: 'Toggle in-active / view mode'},
+ {keys: ['d', 'k'], description: 'Toggle kiosk mode (hides top nav)'},
+ {keys: ['mod+o'], description: 'Toggle shared graph crosshair'},
+ ],
+ 'Focused Panel': [
+ {keys: ['e'], description: 'Toggle panel edit view'},
+ {keys: ['v'], description: 'Toggle panel fullscreen view'},
+ {keys: ['p', 's'], description: 'Open Panel Share Modal'},
+ {keys: ['p', 'r'], description: 'Remove Panel'},
+ ],
+ 'Focused Row': [
+ {keys: ['r', 'c'], description: 'Collapse Row'},
+ {keys: ['r', 'r'], description: 'Remove Row'},
+ ],
+ 'Time Range': [
+ {keys: ['t', 'z'], description: 'Zoom out time range'},
+ {keys: ['t', '
'], description: 'Move time range back'},
+ {keys: ['t', '
'], description: 'Move time range forward'},
+ ],
+ };
+ }
+
+ dismiss() {
+ appEvents.emit('hide-modal');
+ }
+}
+
+export function helpModal() {
+ return {
+ restrict: 'E',
+ templateUrl: 'public/app/core/components/help/help.html',
+ controller: HelpCtrl,
+ bindToController: true,
+ transclude: true,
+ controllerAs: 'ctrl',
+ scope: {},
+ };
+}
+
+coreModule.directive('helpModal', helpModal);
diff --git a/public/app/core/components/info_popover.ts b/public/app/core/components/info_popover.ts
index cc49ecbc4ab..6b2a300551e 100644
--- a/public/app/core/components/info_popover.ts
+++ b/public/app/core/components/info_popover.ts
@@ -8,21 +8,24 @@ import Drop from 'tether-drop';
export function infoPopover() {
return {
restrict: 'E',
+ template: '
',
transclude: true,
link: function(scope, elem, attrs, ctrl, transclude) {
- var inputElem = elem.prev();
- if (inputElem.length === 0) {
- console.log('Failed to find input element for popover');
- return;
- }
-
var offset = attrs.offset || '0 -10px';
var position = attrs.position || 'right middle';
var classes = 'drop-help drop-hide-out-of-bounds';
+ var openOn = 'hover';
+
+ elem.addClass('gf-form-help-icon');
+
if (attrs.wide) {
classes += ' drop-wide';
}
+ if (attrs.mode) {
+ elem.addClass('gf-form-help-icon--' + attrs.mode);
+ }
+
transclude(function(clone, newScope) {
var content = document.createElement("div");
_.each(clone, (node) => {
@@ -30,18 +33,20 @@ export function infoPopover() {
});
var drop = new Drop({
- target: inputElem[0],
+ target: elem[0],
content: content,
position: position,
classes: classes,
- openOn: 'click',
+ openOn: openOn,
+ hoverOpenDelay: 400,
tetherOptions: {
offset: offset
}
});
- scope.$on('$destroy', function() {
+ var unbind = scope.$on('$destroy', function() {
drop.destroy();
+ unbind();
});
});
diff --git a/public/app/core/components/jsontree/jsontree.ts b/public/app/core/components/jsontree/jsontree.ts
new file mode 100644
index 00000000000..14f6012ce12
--- /dev/null
+++ b/public/app/core/components/jsontree/jsontree.ts
@@ -0,0 +1,200 @@
+
+/** Created by: Alex Wendland (me@alexwendland.com), 2014-08-06
+ *
+ * angular-json-tree
+ *
+ * Directive for creating a tree-view out of a JS Object. Only loads
+ * sub-nodes on demand in order to improve performance of rendering large
+ * objects.
+ *
+ * Attributes:
+ * - object (Object, 2-way): JS object to build the tree from
+ * - start-expanded (Boolean, 1-way, ?=true): should the tree default to expanded
+ *
+ * Usage:
+ * // In the controller
+ * scope.someObject = {
+ * test: 'hello',
+ * array: [1,1,2,3,5,8]
+ * };
+ * // In the html
+ *
+ *
+ * Dependencies:
+ * - utils (json-tree.js)
+ * - ajsRecursiveDirectiveHelper (json-tree.js)
+ *
+ * Test: json-tree-test.js
+ */
+
+import angular from 'angular';
+import coreModule from 'app/core/core_module';
+
+var utils = {
+ /* See link for possible type values to check against.
+ * http://stackoverflow.com/questions/4622952/json-object-containing-array
+ *
+ * Value Class Type
+ * -------------------------------------
+ * "foo" String string
+ * new String("foo") String object
+ * 1.2 Number number
+ * new Number(1.2) Number object
+ * true Boolean boolean
+ * new Boolean(true) Boolean object
+ * new Date() Date object
+ * new Error() Error object
+ * [1,2,3] Array object
+ * new Array(1, 2, 3) Array object
+ * new Function("") Function function
+ * /abc/g RegExp object (function in Nitro/V8)
+ * new RegExp("meow") RegExp object (function in Nitro/V8)
+ * {} Object object
+ * new Object() Object object
+ */
+ is: function is(obj, clazz) {
+ return Object.prototype.toString.call(obj).slice(8, -1) === clazz;
+ },
+
+ // See above for possible values
+ whatClass: function whatClass(obj) {
+ return Object.prototype.toString.call(obj).slice(8, -1);
+ },
+
+ // Iterate over an objects keyset
+ forKeys: function forKeys(obj, f) {
+ for (var key in obj) {
+ if (obj.hasOwnProperty(key) && typeof obj[key] !== 'function') {
+ if (f(key, obj[key])) {
+ break;
+ }
+ }
+ }
+ }
+};
+
+coreModule.directive('jsonTree', [function jsonTreeDirective() {
+ return {
+ restrict: 'E',
+ scope: {
+ object: '=',
+ startExpanded: '@',
+ rootName: '@',
+ },
+ template: '
'
+ };
+}]);
+
+coreModule.directive('jsonNode', ['ajsRecursiveDirectiveHelper', function jsonNodeDirective(ajsRecursiveDirectiveHelper) {
+ return {
+ restrict: 'E',
+ scope: {
+ key: '=',
+ value: '=',
+ startExpanded: '@'
+ },
+ compile: function jsonNodeDirectiveCompile(elem) {
+ return ajsRecursiveDirectiveHelper.compile(elem, this);
+ },
+ template: '
{{key}} ' +
+ '
{{value}} ' +
+ '
' +
+ ' {{preview}} ' +
+ '
' +
+ ' ' +
+ ' ' +
+ ' ',
+ pre: function jsonNodeDirectiveLink(scope, elem, attrs) {
+ // Set value's type as Class for CSS styling
+ elem.addClass(utils.whatClass(scope.value).toLowerCase());
+ // If the value is an Array or Object, use expandable view type
+ if (utils.is(scope.value, 'Object') || utils.is(scope.value, 'Array')) {
+ scope.isExpandable = true;
+ // Add expandable class for CSS usage
+ elem.addClass('expandable');
+ // Setup preview text
+ var isArray = utils.is(scope.value, 'Array');
+ scope.preview = isArray ? '[ ' : '{ ';
+ utils.forKeys(scope.value, function jsonNodeDirectiveLinkForKeys(key, value) {
+ if (isArray) {
+ scope.preview += value + ', ';
+ } else {
+ scope.preview += key + ': ' + value + ', ';
+ }
+ });
+ scope.preview = scope.preview.substring(0, scope.preview.length - (scope.preview.length > 2 ? 2 : 0)) + (isArray ? ' ]' : ' }');
+ // If directive initially has isExpanded set, also set shouldRender to true
+ if (scope.startExpanded) {
+ scope.shouldRender = true;
+ elem.addClass('expanded');
+ }
+ // Setup isExpanded state handling
+ scope.isExpanded = scope.startExpanded;
+ scope.toggleExpanded = function jsonNodeDirectiveToggleExpanded() {
+ scope.isExpanded = !scope.isExpanded;
+ if (scope.isExpanded) {
+ elem.addClass('expanded');
+ } else {
+ elem.removeClass('expanded');
+ }
+ // For delaying subnode render until requested
+ scope.shouldRender = true;
+ };
+ } else {
+ scope.isExpandable = false;
+ // Add expandable class for CSS usage
+ elem.addClass('not-expandable');
+ }
+ }
+ };
+}]);
+
+/** Added by: Alex Wendland (me@alexwendland.com), 2014-08-09
+ * Source: http://stackoverflow.com/questions/14430655/recursion-in-angular-directives
+ *
+ * Used to allow for recursion within directives
+ */
+coreModule.factory('ajsRecursiveDirectiveHelper', ['$compile', function RecursiveDirectiveHelper($compile) {
+ return {
+ /**
+ * Manually compiles the element, fixing the recursion loop.
+ * @param element
+ * @param [link] A post-link function, or an object with function(s) registered via pre and post properties.
+ * @returns An object containing the linking functions.
+ */
+ compile: function RecursiveDirectiveHelperCompile(element, link) {
+ // Normalize the link parameter
+ if (angular.isFunction(link)) {
+ link = {
+ post: link
+ };
+ }
+
+ // Break the recursion loop by removing the contents
+ var contents = element.contents().remove();
+ var compiledContents;
+ return {
+ pre: (link && link.pre) ? link.pre : null,
+ /**
+ * Compiles and re-adds the contents
+ */
+ post: function RecursiveDirectiveHelperCompilePost(scope, element) {
+ // Compile the contents
+ if (!compiledContents) {
+ compiledContents = $compile(contents);
+ }
+ // Re-add the compiled contents to the element
+ compiledContents(scope, function (clone) {
+ element.append(clone);
+ });
+
+ // Call the post-linking function, if any
+ if (link && link.post) {
+ link.post.apply(null, arguments);
+ }
+ }
+ };
+ }
+ };
+}]);
diff --git a/public/app/core/components/query_part/query_part.ts b/public/app/core/components/query_part/query_part.ts
new file mode 100644
index 00000000000..fcd337a0a26
--- /dev/null
+++ b/public/app/core/components/query_part/query_part.ts
@@ -0,0 +1,123 @@
+///
+
+import _ from 'lodash';
+
+export class QueryPartDef {
+ type: string;
+ params: any[];
+ defaultParams: any[];
+ renderer: any;
+ category: any;
+ addStrategy: any;
+
+ constructor(options: any) {
+ this.type = options.type;
+ this.params = options.params;
+ this.defaultParams = options.defaultParams;
+ this.renderer = options.renderer;
+ this.category = options.category;
+ this.addStrategy = options.addStrategy;
+ }
+}
+
+export class QueryPart {
+ part: any;
+ def: QueryPartDef;
+ params: any[];
+ text: string;
+
+ constructor(part: any, def: any) {
+ this.part = part;
+ this.def = def;
+ if (!this.def) {
+ throw {message: 'Could not find query part ' + part.type};
+ }
+
+ part.params = part.params || _.clone(this.def.defaultParams);
+ this.params = part.params;
+ this.updateText();
+ }
+
+ render(innerExpr: string) {
+ return this.def.renderer(this, innerExpr);
+ }
+
+ hasMultipleParamsInString (strValue, index) {
+ if (strValue.indexOf(',') === -1) {
+ return false;
+ }
+
+ return this.def.params[index + 1] && this.def.params[index + 1].optional;
+ }
+
+ updateParam (strValue, index) {
+ // handle optional parameters
+ // if string contains ',' and next param is optional, split and update both
+ if (this.hasMultipleParamsInString(strValue, index)) {
+ _.each(strValue.split(','), (partVal, idx) => {
+ this.updateParam(partVal.trim(), idx);
+ });
+ return;
+ }
+
+ if (strValue === '' && this.def.params[index].optional) {
+ this.params.splice(index, 1);
+ } else {
+ this.params[index] = strValue;
+ }
+
+ this.part.params = this.params;
+ this.updateText();
+ }
+
+ updateText() {
+ if (this.params.length === 0) {
+ this.text = this.def.type + '()';
+ return;
+ }
+
+ var text = this.def.type + '(';
+ text += this.params.join(', ');
+ text += ')';
+ this.text = text;
+ }
+}
+
+export function functionRenderer(part, innerExpr) {
+ var str = part.def.type + '(';
+ var parameters = _.map(part.params, (value, index) => {
+ var paramType = part.def.params[index];
+ if (paramType.type === 'time') {
+ if (value === 'auto') {
+ value = '$interval';
+ }
+ }
+ if (paramType.quote === 'single') {
+ return "'" + value + "'";
+ } else if (paramType.quote === 'double') {
+ return '"' + value + '"';
+ }
+
+ return value;
+ });
+
+ if (innerExpr) {
+ parameters.unshift(innerExpr);
+ }
+ return str + parameters.join(', ') + ')';
+}
+
+
+export function suffixRenderer(part, innerExpr) {
+ return innerExpr + ' ' + part.params[0];
+}
+
+export function identityRenderer(part, innerExpr) {
+ return part.params[0];
+}
+
+export function quotedIdentityRenderer(part, innerExpr) {
+ return '"' + part.params[0] + '"';
+}
+
+
diff --git a/public/app/core/components/query_part/query_part_editor.ts b/public/app/core/components/query_part/query_part_editor.ts
new file mode 100644
index 00000000000..ae53eb31001
--- /dev/null
+++ b/public/app/core/components/query_part/query_part_editor.ts
@@ -0,0 +1,176 @@
+///
+
+import _ from 'lodash';
+import $ from 'jquery';
+import coreModule from 'app/core/core_module';
+
+var template = `
+
+
{{part.def.type}}
+
( )
+
+`;
+
+ /** @ngInject */
+export function queryPartEditorDirective($compile, templateSrv) {
+
+ var paramTemplate = '
';
+
+ return {
+ restrict: 'E',
+ template: template,
+ scope: {
+ part: "=",
+ handleEvent: "&",
+ },
+ link: function postLink($scope, elem) {
+ var part = $scope.part;
+ var partDef = part.def;
+ var $paramsContainer = elem.find('.query-part-parameters');
+
+ $scope.partActions = [];
+
+ function clickFuncParam(paramIndex) {
+ /*jshint validthis:true */
+ var $link = $(this);
+ var $input = $link.next();
+
+ $input.val(part.params[paramIndex]);
+ $input.css('width', ($link.width() + 16) + 'px');
+
+ $link.hide();
+ $input.show();
+ $input.focus();
+ $input.select();
+
+ var typeahead = $input.data('typeahead');
+ if (typeahead) {
+ $input.val('');
+ typeahead.lookup();
+ }
+ }
+
+ function inputBlur(paramIndex) {
+ /*jshint validthis:true */
+ var $input = $(this);
+ var $link = $input.prev();
+ var newValue = $input.val();
+
+ if (newValue !== '' || part.def.params[paramIndex].optional) {
+ $link.html(templateSrv.highlightVariablesAsHtml(newValue));
+
+ part.updateParam($input.val(), paramIndex);
+ $scope.$apply(() => {
+ $scope.handleEvent({$event: {name: 'part-param-changed'}});
+ });
+ }
+
+ $input.hide();
+ $link.show();
+ }
+
+ function inputKeyPress(paramIndex, e) {
+ /*jshint validthis:true */
+ if (e.which === 13) {
+ inputBlur.call(this, paramIndex);
+ }
+ }
+
+ function inputKeyDown() {
+ /*jshint validthis:true */
+ this.style.width = (3 + this.value.length) * 8 + 'px';
+ }
+
+ function addTypeahead($input, param, paramIndex) {
+ if (!param.options && !param.dynamicLookup) {
+ return;
+ }
+
+ var typeaheadSource = function (query, callback) {
+ if (param.options) { return param.options; }
+
+ $scope.$apply(function() {
+ $scope.handleEvent({$event: {name: 'get-param-options'}}).then(function(result) {
+ var dynamicOptions = _.map(result, function(op) { return op.value; });
+ callback(dynamicOptions);
+ });
+ });
+ };
+
+ $input.attr('data-provide', 'typeahead');
+ var options = param.options;
+ if (param.type === 'int') {
+ options = _.map(options, function(val) { return val.toString(); });
+ }
+
+ $input.typeahead({
+ source: typeaheadSource,
+ minLength: 0,
+ items: 1000,
+ updater: function (value) {
+ setTimeout(function() {
+ inputBlur.call($input[0], paramIndex);
+ }, 0);
+ return value;
+ }
+ });
+
+ var typeahead = $input.data('typeahead');
+ typeahead.lookup = function () {
+ this.query = this.$element.val() || '';
+ var items = this.source(this.query, $.proxy(this.process, this));
+ return items ? this.process(items) : items;
+ };
+ }
+
+ $scope.showActionsMenu = function() {
+ $scope.handleEvent({$event: {name: 'get-part-actions'}}).then(res => {
+ $scope.partActions = res;
+ });
+ };
+
+ $scope.triggerPartAction = function(action) {
+ $scope.handleEvent({$event: {name: 'action', action: action}});
+ };
+
+ function addElementsAndCompile() {
+ _.each(partDef.params, function(param, index) {
+ if (param.optional && part.params.length <= index) {
+ return;
+ }
+
+ if (index > 0) {
+ $('
, ').appendTo($paramsContainer);
+ }
+
+ var paramValue = templateSrv.highlightVariablesAsHtml(part.params[index]);
+ var $paramLink = $('
' + paramValue + ' ');
+ var $input = $(paramTemplate);
+
+ $paramLink.appendTo($paramsContainer);
+ $input.appendTo($paramsContainer);
+
+ $input.blur(_.partial(inputBlur, index));
+ $input.keyup(inputKeyDown);
+ $input.keypress(_.partial(inputKeyPress, index));
+ $paramLink.click(_.partial(clickFuncParam, index));
+
+ addTypeahead($input, param, index);
+ });
+ }
+
+ function relink() {
+ $paramsContainer.empty();
+ addElementsAndCompile();
+ }
+
+ relink();
+ }
+ };
+}
+
+coreModule.directive('queryPartEditor', queryPartEditorDirective);
diff --git a/public/app/core/components/scroll/scroll.ts b/public/app/core/components/scroll/scroll.ts
new file mode 100644
index 00000000000..914f3ba2dd9
--- /dev/null
+++ b/public/app/core/components/scroll/scroll.ts
@@ -0,0 +1,211 @@
+// ///
+//
+// import _ from 'lodash';
+//
+// var objectAssign = require('object-assign');
+// var Emitter = require('tiny-emitter');
+// var Lethargy = require('lethargy').Lethargy;
+// var support = require('./support');
+// var clone = require('./clone');
+// var bindAll = require('bindall-standalone');
+// var EVT_ID = 'virtualscroll';
+//
+// var keyCodes = {
+// LEFT: 37,
+// UP: 38,
+// RIGHT: 39,
+// DOWN: 40
+// };
+//
+// function VirtualScroll(this: any, options) {
+// _.bindAll(this, '_onWheel', '_onMouseWheel', '_onTouchStart', '_onTouchMove', '_onKeyDown');
+//
+// this.el = window;
+// if (options && options.el) {
+// this.el = options.el;
+// delete options.el;
+// }
+//
+// this.options = _.assign({
+// mouseMultiplier: 1,
+// touchMultiplier: 2,
+// firefoxMultiplier: 15,
+// keyStep: 120,
+// preventTouch: false,
+// unpreventTouchClass: 'vs-touchmove-allowed',
+// limitInertia: false
+// }, options);
+//
+// if (this.options.limitInertia) this._lethargy = new Lethargy();
+//
+// this._emitter = new Emitter();
+// this._event = {
+// y: 0,
+// x: 0,
+// deltaX: 0,
+// deltaY: 0
+// };
+//
+// this.touchStartX = null;
+// this.touchStartY = null;
+// this.bodyTouchAction = null;
+// }
+//
+// VirtualScroll.prototype._notify = function(e) {
+// var evt = this._event;
+// evt.x += evt.deltaX;
+// evt.y += evt.deltaY;
+//
+// this._emitter.emit(EVT_ID, {
+// x: evt.x,
+// y: evt.y,
+// deltaX: evt.deltaX,
+// deltaY: evt.deltaY,
+// originalEvent: e
+// });
+// };
+//
+// VirtualScroll.prototype._onWheel = function(e) {
+// var options = this.options;
+// if (this._lethargy && this._lethargy.check(e) === false) return;
+//
+// var evt = this._event;
+//
+// // In Chrome and in Firefox (at least the new one)
+// evt.deltaX = e.wheelDeltaX || e.deltaX * -1;
+// evt.deltaY = e.wheelDeltaY || e.deltaY * -1;
+//
+// // for our purpose deltamode = 1 means user is on a wheel mouse, not touch pad
+// // real meaning: https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent#Delta_modes
+// if(support.isFirefox && e.deltaMode == 1) {
+// evt.deltaX *= options.firefoxMultiplier;
+// evt.deltaY *= options.firefoxMultiplier;
+// }
+//
+// evt.deltaX *= options.mouseMultiplier;
+// evt.deltaY *= options.mouseMultiplier;
+//
+// this._notify(e);
+// };
+//
+// VirtualScroll.prototype._onMouseWheel = function(e) {
+// if (this.options.limitInertia && this._lethargy.check(e) === false) return;
+//
+// var evt = this._event;
+//
+// // In Safari, IE and in Chrome if 'wheel' isn't defined
+// evt.deltaX = (e.wheelDeltaX) ? e.wheelDeltaX : 0;
+// evt.deltaY = (e.wheelDeltaY) ? e.wheelDeltaY : e.wheelDelta;
+//
+// this._notify(e);
+// };
+//
+// VirtualScroll.prototype._onTouchStart = function(e) {
+// var t = (e.targetTouches) ? e.targetTouches[0] : e;
+// this.touchStartX = t.pageX;
+// this.touchStartY = t.pageY;
+// };
+//
+// VirtualScroll.prototype._onTouchMove = function(e) {
+// var options = this.options;
+// if(options.preventTouch
+// && !e.target.classList.contains(options.unpreventTouchClass)) {
+// e.preventDefault();
+// }
+//
+// var evt = this._event;
+//
+// var t = (e.targetTouches) ? e.targetTouches[0] : e;
+//
+// evt.deltaX = (t.pageX - this.touchStartX) * options.touchMultiplier;
+// evt.deltaY = (t.pageY - this.touchStartY) * options.touchMultiplier;
+//
+// this.touchStartX = t.pageX;
+// this.touchStartY = t.pageY;
+//
+// this._notify(e);
+// };
+//
+// VirtualScroll.prototype._onKeyDown = function(e) {
+// var evt = this._event;
+// evt.deltaX = evt.deltaY = 0;
+//
+// switch(e.keyCode) {
+// case keyCodes.LEFT:
+// case keyCodes.UP:
+// evt.deltaY = this.options.keyStep;
+// break;
+//
+// case keyCodes.RIGHT:
+// case keyCodes.DOWN:
+// evt.deltaY = - this.options.keyStep;
+// break;
+//
+// default:
+// return;
+// }
+//
+// this._notify(e);
+// };
+//
+// VirtualScroll.prototype._bind = function() {
+// if(support.hasWheelEvent) this.el.addEventListener('wheel', this._onWheel);
+// if(support.hasMouseWheelEvent) this.el.addEventListener('mousewheel', this._onMouseWheel);
+//
+// if(support.hasTouch) {
+// this.el.addEventListener('touchstart', this._onTouchStart);
+// this.el.addEventListener('touchmove', this._onTouchMove);
+// }
+//
+// if(support.hasPointer && support.hasTouchWin) {
+// this.bodyTouchAction = document.body.style.msTouchAction;
+// document.body.style.msTouchAction = 'none';
+// this.el.addEventListener('MSPointerDown', this._onTouchStart, true);
+// this.el.addEventListener('MSPointerMove', this._onTouchMove, true);
+// }
+//
+// if(support.hasKeyDown) document.addEventListener('keydown', this._onKeyDown);
+// };
+//
+// VirtualScroll.prototype._unbind = function() {
+// if(support.hasWheelEvent) this.el.removeEventListener('wheel', this._onWheel);
+// if(support.hasMouseWheelEvent) this.el.removeEventListener('mousewheel', this._onMouseWheel);
+//
+// if(support.hasTouch) {
+// this.el.removeEventListener('touchstart', this._onTouchStart);
+// this.el.removeEventListener('touchmove', this._onTouchMove);
+// }
+//
+// if(support.hasPointer && support.hasTouchWin) {
+// document.body.style.msTouchAction = this.bodyTouchAction;
+// this.el.removeEventListener('MSPointerDown', this._onTouchStart, true);
+// this.el.removeEventListener('MSPointerMove', this._onTouchMove, true);
+// }
+//
+// if(support.hasKeyDown) document.removeEventListener('keydown', this._onKeyDown);
+// };
+//
+// VirtualScroll.prototype.on = function(cb, ctx) {
+// this._emitter.on(EVT_ID, cb, ctx);
+//
+// var events = this._emitter.e;
+// if (events && events[EVT_ID] && events[EVT_ID].length === 1) this._bind();
+// };
+//
+// VirtualScroll.prototype.off = function(cb, ctx) {
+// this._emitter.off(EVT_ID, cb, ctx);
+//
+// var events = this._emitter.e;
+// if (!events[EVT_ID] || events[EVT_ID].length <= 0) this._unbind();
+// };
+//
+// VirtualScroll.prototype.reset = function() {
+// var evt = this._event;
+// evt.x = 0;
+// evt.y = 0;
+// };
+//
+// VirtualScroll.prototype.destroy = function() {
+// this._emitter.off();
+// this._unbind();
+// };
diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html
index 35c4431d80c..cc021bb69ed 100644
--- a/public/app/core/components/search/search.html
+++ b/public/app/core/components/search/search.html
@@ -27,17 +27,13 @@
-
- {{::menuItem.text}}
+
+
+
+
+
+
+
@@ -49,7 +55,7 @@
-
diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts
index a47704f9d7d..c6d721e0977 100644
--- a/public/app/core/components/sidemenu/sidemenu.ts
+++ b/public/app/core/components/sidemenu/sidemenu.ts
@@ -12,6 +12,11 @@ export class SideMenuCtrl {
mainLinks: any;
orgMenu: any;
appSubUrl: string;
+ loginUrl: string;
+ orgFilter: string;
+ orgItems: any;
+ orgs: any;
+ maxShownOrgs: number;
/** @ngInject */
constructor(private $scope, private $location, private contextSrv, private backendSrv, private $element) {
@@ -19,16 +24,20 @@ export class SideMenuCtrl {
this.user = contextSrv.user;
this.appSubUrl = config.appSubUrl;
this.showSignout = this.contextSrv.isSignedIn && !config['authProxyEnabled'];
+ this.maxShownOrgs = 10;
this.mainLinks = config.bootData.mainNavLinks;
this.openUserDropdown();
+ this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path());
this.$scope.$on('$routeChangeSuccess', () => {
if (!this.contextSrv.pinned) {
this.contextSrv.sidemenu = false;
}
+ this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path());
});
+ this.orgFilter = '';
}
getUrl(url) {
@@ -49,46 +58,45 @@ export class SideMenuCtrl {
this.orgMenu.push({section: this.user.orgName, cssClass: 'dropdown-menu-title'});
this.orgMenu.push({
text: "Preferences",
- url: this.getUrl("/org"),
+ url: this.getUrl("/org")
});
this.orgMenu.push({
text: "Users",
- url: this.getUrl("/org/users"),
+ url: this.getUrl("/org/users")
});
this.orgMenu.push({
text: "API Keys",
- url: this.getUrl("/org/apikeys"),
+ url: this.getUrl("/org/apikeys")
});
}
this.orgMenu.push({cssClass: "divider"});
-
this.backendSrv.get('/api/user/orgs').then(orgs => {
- orgs.forEach(org => {
- if (org.orgId === this.contextSrv.user.orgId) {
- return;
- }
-
- this.orgMenu.push({
- text: "Switch to " + org.name,
- icon: "fa fa-fw fa-random",
- click: () => {
- this.switchOrg(org.orgId);
- }
- });
- });
-
- if (config.allowOrgCreate) {
- this.orgMenu.push({text: "New organization", icon: "fa fa-fw fa-plus", url: this.getUrl('/org/new')});
- }
+ this.orgs = orgs;
+ this.loadOrgsItems();
});
}
- switchOrg(orgId) {
- this.backendSrv.post('/api/user/using/' + orgId).then(() => {
- window.location.href = `${config.appSubUrl}/`;
+ loadOrgsItems(){
+ this.orgItems = [];
+ this.orgs.forEach(org => {
+ if (org.orgId === this.contextSrv.user.orgId) {
+ return;
+ }
+
+ if (this.orgItems.length < this.maxShownOrgs && (this.orgFilter === '' || org.name.indexOf(this.orgFilter) !== -1)){
+ this.orgItems.push({
+ text: "Switch to " + org.name,
+ icon: "fa fa-fw fa-random",
+ url: this.getUrl('/profile/switch-org/' + org.orgId),
+ target: '_self'
+ });
+ }
});
- };
+ if (config.allowOrgCreate) {
+ this.orgItems.push({text: "New organization", icon: "fa fa-fw fa-plus", url: this.getUrl('/org/new')});
+ }
+ }
}
export function sideMenuDirective() {
diff --git a/public/app/core/components/switch.ts b/public/app/core/components/switch.ts
index 1dddae20d49..2a64ec487f7 100644
--- a/public/app/core/components/switch.ts
+++ b/public/app/core/components/switch.ts
@@ -7,7 +7,12 @@ import coreModule from 'app/core/core_module';
import Drop from 'tether-drop';
var template = `
-{{ctrl.label}}
+
+ {{ctrl.label}}
+
+ {{ctrl.tooltip}}
+
+
@@ -21,17 +26,14 @@ export class SwitchCtrl {
id: any;
/** @ngInject */
- constructor($scope) {
+ constructor($scope, private $timeout) {
this.show = true;
this.id = $scope.$id;
}
internalOnChange() {
- return new Promise(resolve => {
- setTimeout(() => {
- this.onChange();
- resolve();
- });
+ return this.$timeout(() => {
+ return this.onChange();
});
}
@@ -52,22 +54,6 @@ export function switchDirective() {
onChange: "&",
},
template: template,
- link: (scope, elem) => {
- if (scope.ctrl.tooltip) {
- var drop = new Drop({
- target: elem[0],
- content: scope.ctrl.tooltip,
- position: "right middle",
- classes: 'drop-help',
- openOn: 'hover',
- hoverOpenDelay: 400,
- });
-
- scope.$on('$destroy', function() {
- drop.destroy();
- });
- }
- }
};
}
diff --git a/public/app/core/components/wizard/wizard.html b/public/app/core/components/wizard/wizard.html
new file mode 100644
index 00000000000..9d3f680649a
--- /dev/null
+++ b/public/app/core/components/wizard/wizard.html
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/app/core/components/wizard/wizard.ts b/public/app/core/components/wizard/wizard.ts
new file mode 100644
index 00000000000..2ae38cf9e03
--- /dev/null
+++ b/public/app/core/components/wizard/wizard.ts
@@ -0,0 +1,73 @@
+///
+
+import config from 'app/core/config';
+import _ from 'lodash';
+import $ from 'jquery';
+
+import coreModule from 'app/core/core_module';
+import appEvents from 'app/core/app_events';
+
+export class WizardSrv {
+ /** @ngInject */
+ constructor() {
+ }
+}
+
+export interface WizardStep {
+ name: string;
+ type: string;
+ process: any;
+}
+
+export class SelectOptionStep {
+ type: string;
+ name: string;
+ fulfill: any;
+
+ constructor() {
+ this.type = 'select';
+ }
+
+ process() {
+ return new Promise((fulfill, reject) => {
+
+ });
+ }
+}
+
+export class WizardFlow {
+ name: string;
+ steps: WizardStep[];
+
+ constructor(name) {
+ this.name = name;
+ this.steps = [];
+ }
+
+ addStep(step) {
+ this.steps.push(step);
+ }
+
+ next(index) {
+ var step = this.steps[0];
+
+ return step.process().then(() => {
+ if (this.steps.length === index+1) {
+ return;
+ }
+
+ return this.next(index+1);
+ });
+ }
+
+ start() {
+ appEvents.emit('show-modal', {
+ src: 'public/app/core/components/wizard/wizard.html',
+ model: this
+ });
+
+ return this.next(0);
+ }
+}
+
+coreModule.service('wizardSrv', WizardSrv);
diff --git a/public/app/core/controllers/inspect_ctrl.js b/public/app/core/controllers/inspect_ctrl.js
index 2adc62f0039..39d550658f1 100644
--- a/public/app/core/controllers/inspect_ctrl.js
+++ b/public/app/core/controllers/inspect_ctrl.js
@@ -7,7 +7,7 @@ define([
function (angular, _, $, coreModule) {
'use strict';
- coreModule.default.controller('InspectCtrl', function($scope) {
+ coreModule.default.controller('InspectCtrl', function($scope, $sanitize) {
var model = $scope.inspector;
function getParametersFromQueryString(queryString) {
@@ -32,7 +32,11 @@ function (angular, _, $, coreModule) {
if (_.isString(model.error.data)) {
$scope.response = $("
" + model.error.data + "
").text();
} else if (model.error.data) {
- $scope.response = angular.toJson(model.error.data, true);
+ if (model.error.data.response) {
+ $scope.response = $sanitize(model.error.data.response);
+ } else {
+ $scope.response = angular.toJson(model.error.data, true);
+ }
} else if (model.error.message) {
$scope.message = model.error.message;
}
@@ -44,13 +48,13 @@ function (angular, _, $, coreModule) {
}
if (model.error.stack) {
- $scope.editor.index = 2;
+ $scope.editor.index = 3;
$scope.stack_trace = model.error.stack;
$scope.message = model.error.message;
}
if (model.error.config && model.error.config.data) {
- $scope.editor.index = 1;
+ $scope.editor.index = 2;
if (_.isString(model.error.config.data)) {
$scope.request_parameters = getParametersFromQueryString(model.error.config.data);
diff --git a/public/app/core/controllers/login_ctrl.js b/public/app/core/controllers/login_ctrl.js
index 89757c3d141..fa3af3d10f0 100644
--- a/public/app/core/controllers/login_ctrl.js
+++ b/public/app/core/controllers/login_ctrl.js
@@ -1,11 +1,19 @@
define([
'angular',
+ 'lodash',
'../core_module',
'app/core/config',
],
-function (angular, coreModule, config) {
+function (angular, _, coreModule, config) {
'use strict';
+ var failCodes = {
+ "1000": "Required team membership not fulfilled",
+ "1001": "Required organization membership not fulfilled",
+ "1002": "Required email domain not fulfilled",
+ "1003": "Login provider denied login request",
+ };
+
coreModule.default.controller('LoginCtrl', function($scope, backendSrv, contextSrv, $location) {
$scope.formModel = {
user: '',
@@ -15,9 +23,10 @@ function (angular, coreModule, config) {
contextSrv.sidemenu = false;
- $scope.googleAuthEnabled = config.googleAuthEnabled;
- $scope.githubAuthEnabled = config.githubAuthEnabled;
- $scope.oauthEnabled = config.githubAuthEnabled || config.googleAuthEnabled;
+ $scope.oauth = config.oauth;
+ $scope.oauthEnabled = _.keys(config.oauth).length > 0;
+
+ $scope.disableLoginForm = config.disableLoginForm;
$scope.disableUserSignUp = config.disableUserSignUp;
$scope.loginHint = config.loginHint;
@@ -28,20 +37,13 @@ function (angular, coreModule, config) {
$scope.$watch("loginMode", $scope.loginModeChanged);
var params = $location.search();
- if (params.failedMsg) {
- $scope.appEvent('alert-warning', ['Login Failed', params.failedMsg]);
+ if (params.failCode) {
+ $scope.appEvent('alert-warning', ['Login Failed', failCodes[params.failCode]]);
delete params.failedMsg;
$location.search(params);
}
};
- // build info view model
- $scope.buildInfo = {
- version: config.buildInfo.version,
- commit: config.buildInfo.commit,
- buildstamp: new Date(config.buildInfo.buildstamp * 1000)
- };
-
$scope.submit = function() {
if ($scope.loginMode) {
$scope.login();
@@ -76,7 +78,12 @@ function (angular, coreModule, config) {
}
backendSrv.post('/login', $scope.formModel).then(function(result) {
- if (result.redirectUrl) {
+ var params = $location.search();
+
+ if (params.redirect && params.redirect[0] === '/') {
+ window.location.href = config.appSubUrl + params.redirect;
+ }
+ else if (result.redirectUrl) {
window.location.href = result.redirectUrl;
} else {
window.location.href = config.appSubUrl + '/';
diff --git a/public/app/core/core.ts b/public/app/core/core.ts
index 279f54d4e45..4aa2e7eb64a 100644
--- a/public/app/core/core.ts
+++ b/public/app/core/core.ts
@@ -5,13 +5,11 @@ import "./directives/annotation_tooltip";
import "./directives/dash_class";
import "./directives/confirm_click";
import "./directives/dash_edit_link";
-import "./directives/dash_upload";
import "./directives/dropdown_typeahead";
-import "./directives/grafana_version_check";
import "./directives/metric_segment";
import "./directives/misc";
import "./directives/ng_model_on_blur";
-import "./directives/password_strenght";
+import "./directives/password_strength";
import "./directives/spectrum_picker";
import "./directives/tags";
import "./directives/value_select_dropdown";
@@ -20,6 +18,7 @@ import "./directives/rebuild_on_change";
import "./directives/give_focus";
import './jquery_extended';
import './partials';
+import './components/jsontree/jsontree';
import {grafanaAppDirective} from './components/grafana_app';
import {sideMenuDirective} from './components/sidemenu/sidemenu';
@@ -32,12 +31,20 @@ import {liveSrv} from './live/live_srv';
import {Emitter} from './utils/emitter';
import {layoutSelector} from './components/layout_selector/layout_selector';
import {switchDirective} from './components/switch';
+import {dashboardSelector} from './components/dashboard_selector';
+import {queryPartEditorDirective} from './components/query_part/query_part_editor';
+import {WizardFlow} from './components/wizard/wizard';
import 'app/core/controllers/all';
import 'app/core/services/all';
import 'app/core/routes/routes';
import './filters/filters';
import coreModule from './core_module';
import appEvents from './app_events';
+import colors from './utils/colors';
+import {assignModelProperties} from './utils/model_utils';
+import {contextSrv} from './services/context_srv';
+import {KeybindingSrv} from './services/keybindingSrv';
+import {helpModal} from './components/help/help';
export {
@@ -54,4 +61,12 @@ export {
infoPopover,
Emitter,
appEvents,
+ dashboardSelector,
+ queryPartEditorDirective,
+ WizardFlow,
+ colors,
+ assignModelProperties,
+ contextSrv,
+ KeybindingSrv,
+ helpModal,
};
diff --git a/public/app/core/directives/dash_class.js b/public/app/core/directives/dash_class.js
index 013c267fc0f..7ac13a552ec 100644
--- a/public/app/core/directives/dash_class.js
+++ b/public/app/core/directives/dash_class.js
@@ -10,8 +10,6 @@ function (_, $, coreModule) {
return {
link: function($scope, elem) {
- var lastHideControlsVal;
-
$scope.onAppEvent('panel-fullscreen-enter', function() {
elem.toggleClass('panel-in-fullscreen', true);
});
@@ -20,13 +18,13 @@ function (_, $, coreModule) {
elem.toggleClass('panel-in-fullscreen', false);
});
+ var lastHideControlsVal;
$scope.$watch('dashboard.hideControls', function() {
if (!$scope.dashboard) {
return;
}
- var hideControls = $scope.dashboard.hideControls || $scope.playlist_active;
-
+ var hideControls = $scope.dashboard.hideControls;
if (lastHideControlsVal !== hideControls) {
elem.toggleClass('hide-controls', hideControls);
lastHideControlsVal = hideControls;
diff --git a/public/app/core/directives/dash_edit_link.js b/public/app/core/directives/dash_edit_link.js
index 23855925541..7486d0ada18 100644
--- a/public/app/core/directives/dash_edit_link.js
+++ b/public/app/core/directives/dash_edit_link.js
@@ -6,28 +6,13 @@ function ($, coreModule) {
'use strict';
var editViewMap = {
- 'settings': { src: 'public/app/features/dashboard/partials/settings.html', title: "Settings" },
- 'annotations': { src: 'public/app/features/annotations/partials/editor.html', title: "Annotations" },
- 'templating': { src: 'public/app/features/templating/partials/editor.html', title: "Templating" }
+ 'settings': { src: 'public/app/features/dashboard/partials/settings.html'},
+ 'annotations': { src: 'public/app/features/annotations/partials/editor.html'},
+ 'templating': { src: 'public/app/features/templating/partials/editor.html'},
+ 'import': { src: '
' }
};
- coreModule.default.directive('dashEditorLink', function($timeout) {
- return {
- restrict: 'A',
- link: function(scope, elem, attrs) {
- var partial = attrs.dashEditorLink;
-
- elem.bind('click',function() {
- $timeout(function() {
- var editorScope = attrs.editorScope === 'isolated' ? null : scope;
- scope.appEvent('show-dash-editor', { src: partial, scope: editorScope });
- });
- });
- }
- };
- });
-
- coreModule.default.directive('dashEditorView', function($compile, $location) {
+ coreModule.default.directive('dashEditorView', function($compile, $location, $rootScope) {
return {
restrict: 'A',
link: function(scope, elem) {
@@ -72,8 +57,25 @@ function ($, coreModule) {
}
};
- var src = "'" + payload.src + "'";
- var view = $('
');
+ if (editview === 'import') {
+ var modalScope = $rootScope.$new();
+ modalScope.$on("$destroy", function() {
+ editorScope.dismiss();
+ });
+
+ $rootScope.appEvent('show-modal', {
+ templateHtml: '
',
+ scope: modalScope,
+ backdrop: 'static'
+ });
+
+ return;
+ }
+
+ var view = payload.src;
+ if (view.indexOf('.html') > 0) {
+ view = $('
');
+ }
elem.append(view);
$compile(elem.contents())(editorScope);
diff --git a/public/app/core/directives/dash_upload.js b/public/app/core/directives/dash_upload.js
deleted file mode 100644
index b03bc201e83..00000000000
--- a/public/app/core/directives/dash_upload.js
+++ /dev/null
@@ -1,46 +0,0 @@
-define([
- '../core_module',
- 'app/core/utils/kbn',
-],
-function (coreModule, kbn) {
- 'use strict';
-
- coreModule.default.directive('dashUpload', function(timer, alertSrv, $location) {
- return {
- restrict: 'A',
- link: function(scope) {
- function file_selected(evt) {
- var files = evt.target.files; // FileList object
- var readerOnload = function() {
- return function(e) {
- scope.$apply(function() {
- try {
- window.grafanaImportDashboard = JSON.parse(e.target.result);
- } catch (err) {
- console.log(err);
- scope.appEvent('alert-error', ['Import failed', 'JSON -> JS Serialization failed: ' + err.message]);
- return;
- }
- var title = kbn.slugifyForUrl(window.grafanaImportDashboard.title);
- window.grafanaImportDashboard.id = null;
- $location.path('/dashboard-import/' + title);
- });
- };
- };
- for (var i = 0, f; f = files[i]; i++) {
- var reader = new FileReader();
- reader.onload = (readerOnload)(f);
- reader.readAsText(f);
- }
- }
- // Check for the various File API support.
- if (window.File && window.FileReader && window.FileList && window.Blob) {
- // Something
- document.getElementById('dashupload').addEventListener('change', file_selected, false);
- } else {
- alertSrv.set('Oops','Sorry, the HTML5 File APIs are not fully supported in this browser.','error');
- }
- }
- };
- });
-});
diff --git a/public/app/core/directives/dropdown_typeahead.js b/public/app/core/directives/dropdown_typeahead.js
index 2dc5111874e..b44e953785e 100644
--- a/public/app/core/directives/dropdown_typeahead.js
+++ b/public/app/core/directives/dropdown_typeahead.js
@@ -9,10 +9,10 @@ function (_, $, coreModule) {
coreModule.default.directive('dropdownTypeahead', function($compile) {
var inputTemplate = '
';
- var buttonTemplate = '
';
diff --git a/public/app/core/directives/grafana_version_check.js b/public/app/core/directives/grafana_version_check.js
deleted file mode 100644
index bee437b8183..00000000000
--- a/public/app/core/directives/grafana_version_check.js
+++ /dev/null
@@ -1,31 +0,0 @@
-define([
- '../core_module',
-],
-function (coreModule) {
- 'use strict';
-
- coreModule.default.directive('grafanaVersionCheck', function($http, contextSrv) {
- return {
- restrict: 'A',
- link: function(scope, elem) {
- if (contextSrv.version === 'master') {
- return;
- }
-
- $http({ method: 'GET', url: 'https://grafanarel.s3.amazonaws.com/latest.json' })
- .then(function(response) {
- if (!response.data || !response.data.version) {
- return;
- }
-
- if (contextSrv.version !== response.data.version) {
- elem.append('
' +
- '
' +
- 'New version available: ' + response.data.version +
- ' ');
- }
- });
- }
- };
- });
-});
diff --git a/public/app/core/directives/metric_segment.js b/public/app/core/directives/metric_segment.js
index 56dc1fd935a..c3e51dc7a0c 100644
--- a/public/app/core/directives/metric_segment.js
+++ b/public/app/core/directives/metric_segment.js
@@ -8,10 +8,13 @@ function (_, $, coreModule) {
coreModule.default.directive('metricSegment', function($compile, $sce) {
var inputTemplate = '
';
- var buttonTemplate = '
';
+
+ var selectTemplate = '
';
return {
@@ -22,8 +25,8 @@ function (_, $, coreModule) {
},
link: function($scope, elem) {
var $input = $(inputTemplate);
- var $button = $(buttonTemplate);
var segment = $scope.segment;
+ var $button = $(segment.selectMode ? selectTemplate : linkTemplate);
var options = null;
var cancelBlur = null;
var linkMode = true;
@@ -37,10 +40,10 @@ function (_, $, coreModule) {
}
$scope.$apply(function() {
- var selected = _.findWhere($scope.altSegments, { value: value });
+ var selected = _.find($scope.altSegments, {value: value});
if (selected) {
segment.value = selected.value;
- segment.html = selected.html;
+ segment.html = selected.html || selected.value;
segment.fake = false;
segment.expandable = selected.expandable;
}
@@ -73,10 +76,8 @@ function (_, $, coreModule) {
};
$scope.source = function(query, callback) {
- if (options) { return options; }
-
$scope.$apply(function() {
- $scope.getOptions().then(function(altSegments) {
+ $scope.getOptions({ measurementFilter: query }).then(function(altSegments) {
$scope.altSegments = altSegments;
options = _.map($scope.altSegments, function(alt) { return alt.value; });
@@ -110,7 +111,7 @@ function (_, $, coreModule) {
if (str[0] === '/') { str = str.substring(1); }
if (str[str.length - 1] === '/') { str = str.substring(0, str.length-1); }
try {
- return item.toLowerCase().match(str);
+ return item.toLowerCase().match(str.toLowerCase());
} catch(e) {
return false;
}
@@ -135,7 +136,7 @@ function (_, $, coreModule) {
$button.click(function() {
options = null;
- $input.css('width', ($button.width() + 16) + 'px');
+ $input.css('width', (Math.max($button.width(), 80) + 16) + 'px');
$button.hide();
$input.show();
@@ -169,31 +170,42 @@ function (_, $, coreModule) {
},
link: {
pre: function postLink($scope, elem, attrs) {
+ var cachedOptions;
$scope.valueToSegment = function(value) {
- var option = _.findWhere($scope.options, {value: value});
+ var option = _.find($scope.options, {value: value});
var segment = {
cssClass: attrs.cssClass,
custom: attrs.custom,
value: option ? option.text : value,
+ selectMode: attrs.selectMode,
};
+
return uiSegmentSrv.newSegment(segment);
};
$scope.getOptionsInternal = function() {
if ($scope.options) {
- var optionSegments = _.map($scope.options, function(option) {
- return uiSegmentSrv.newSegment({value: option.text});
- });
- return $q.when(optionSegments);
+ cachedOptions = $scope.options;
+ return $q.when(_.map($scope.options, function(option) {
+ return {value: option.text};
+ }));
} else {
- return $scope.getOptions();
+ return $scope.getOptions().then(function(options) {
+ cachedOptions = options;
+ return _.map(options, function(option) {
+ if (option.html) {
+ return option;
+ }
+ return {value: option.text};
+ });
+ });
}
};
$scope.onSegmentChange = function() {
- if ($scope.options) {
- var option = _.findWhere($scope.options, {text: $scope.segment.value});
+ if (cachedOptions) {
+ var option = _.find(cachedOptions, {text: $scope.segment.value});
if (option && option.value !== $scope.property) {
$scope.property = option.value;
} else if (attrs.custom !== 'false') {
@@ -206,7 +218,9 @@ function (_, $, coreModule) {
// needs to call this after digest so
// property is synced with outerscope
$scope.$$postDigest(function() {
- $scope.onChange();
+ $scope.$apply(function() {
+ $scope.onChange();
+ });
});
};
diff --git a/public/app/core/directives/ng_model_on_blur.js b/public/app/core/directives/ng_model_on_blur.js
index 6f4a55b53f0..09c87f5fabe 100644
--- a/public/app/core/directives/ng_model_on_blur.js
+++ b/public/app/core/directives/ng_model_on_blur.js
@@ -47,7 +47,7 @@ function (coreModule, kbn, rangeUtil) {
if (ctrl.$isEmpty(modelValue)) {
return true;
}
- if (viewValue.indexOf('$') === 0) {
+ if (viewValue.indexOf('$') === 0 || viewValue.indexOf('+$') === 0) {
return true; // allow template variable
}
var info = rangeUtil.describeTextRange(viewValue);
diff --git a/public/app/core/directives/password_strenght.js b/public/app/core/directives/password_strength.js
similarity index 100%
rename from public/app/core/directives/password_strenght.js
rename to public/app/core/directives/password_strength.js
diff --git a/public/app/core/directives/plugin_component.ts b/public/app/core/directives/plugin_component.ts
index 4f87a94573e..83c030cb317 100644
--- a/public/app/core/directives/plugin_component.ts
+++ b/public/app/core/directives/plugin_component.ts
@@ -58,7 +58,7 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
var componentInfo: any = {
name: 'panel-plugin-' + scope.panel.type,
bindings: {dashboard: "=", panel: "=", row: "="},
- attrs: {dashboard: "dashboard", panel: "panel", row: "row"},
+ attrs: {dashboard: "ctrl.dashboard", panel: "panel", row: "ctrl.row"},
};
var panelElemName = 'panel-' + scope.panel.type;
@@ -136,12 +136,12 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
}
// Annotations
case "annotations-query-ctrl": {
- return System.import(scope.currentDatasource.meta.module).then(function(dsModule) {
+ return System.import(scope.ctrl.currentDatasource.meta.module).then(function(dsModule) {
return {
- baseUrl: scope.currentDatasource.meta.baseUrl,
- name: 'annotations-query-ctrl-' + scope.currentDatasource.meta.id,
+ baseUrl: scope.ctrl.currentDatasource.meta.baseUrl,
+ name: 'annotations-query-ctrl-' + scope.ctrl.currentDatasource.meta.id,
bindings: {annotation: "=", datasource: "="},
- attrs: {"annotation": "currentAnnotation", datasource: "currentDatasource"},
+ attrs: {"annotation": "ctrl.currentAnnotation", datasource: "ctrl.currentDatasource"},
Component: dsModule.AnnotationsQueryCtrl,
};
});
@@ -169,7 +169,7 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
return System.import(model.module).then(function(appModule) {
return {
baseUrl: model.baseUrl,
- name: 'app-config-' + model.pluginId,
+ name: 'app-config-' + model.id,
bindings: {appModel: "=", appEditCtrl: "="},
attrs: {"app-model": "ctrl.model", "app-edit-ctrl": "ctrl"},
Component: appModule.ConfigCtrl,
@@ -206,9 +206,15 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
});
$compile(child)(scope);
-
elem.empty();
- elem.append(child);
+
+ // let a binding digest cycle complete before adding to dom
+ setTimeout(function() {
+ elem.append(child);
+ scope.$applyAsync(function() {
+ scope.$broadcast('refresh');
+ });
+ });
}
function registerPluginComponent(scope, elem, attrs, componentInfo) {
@@ -238,7 +244,7 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
registerPluginComponent(scope, elem, attrs, componentInfo);
}).catch(err => {
$rootScope.appEvent('alert-error', ['Plugin Error', err.message || err]);
- console.log('Plugin componnet error', err);
+ console.log('Plugin component error', err);
});
}
};
diff --git a/public/app/core/directives/value_select_dropdown.js b/public/app/core/directives/value_select_dropdown.js
index 60d257d6fa8..8b1719c669d 100644
--- a/public/app/core/directives/value_select_dropdown.js
+++ b/public/app/core/directives/value_select_dropdown.js
@@ -51,7 +51,7 @@ function (angular, _, coreModule) {
});
// convert values to text
- var currentTexts = _.pluck(selectedAndNotInTag, 'text');
+ var currentTexts = _.map(selectedAndNotInTag, 'text');
// join texts
vm.linkText = currentTexts.join(' + ');
@@ -75,7 +75,7 @@ function (angular, _, coreModule) {
tag.selected = !tag.selected;
var tagValuesPromise;
if (!tag.values) {
- tagValuesPromise = vm.getValuesForTag({tagKey: tag.text});
+ tagValuesPromise = vm.variable.getValuesForTag(tag.text);
} else {
tagValuesPromise = $q.when(tag.values);
}
@@ -167,7 +167,7 @@ function (angular, _, coreModule) {
_.each(vm.tags, function(tag) {
if (tag.selected) {
_.each(tag.values, function(value) {
- if (!_.findWhere(vm.selectedValues, {value: value})) {
+ if (!_.find(vm.selectedValues, {value: value})) {
tag.selected = false;
}
});
@@ -175,8 +175,8 @@ function (angular, _, coreModule) {
});
vm.selectedTags = _.filter(vm.tags, {selected: true});
- vm.variable.current.value = _.pluck(vm.selectedValues, 'value');
- vm.variable.current.text = _.pluck(vm.selectedValues, 'text').join(' + ');
+ vm.variable.current.value = _.map(vm.selectedValues, 'value');
+ vm.variable.current.text = _.map(vm.selectedValues, 'text').join(' + ');
vm.variable.current.tags = vm.selectedTags;
if (!vm.variable.multi) {
@@ -225,7 +225,7 @@ function (angular, _, coreModule) {
coreModule.default.directive('valueSelectDropdown', function($compile, $window, $timeout, $rootScope) {
return {
- scope: { variable: "=", onUpdated: "&", getValuesForTag: "&" },
+ scope: { variable: "=", onUpdated: "&"},
templateUrl: 'public/app/partials/valueSelectDropdown.html',
controller: 'ValueSelectDropdownCtrl',
controllerAs: 'vm',
@@ -236,7 +236,7 @@ function (angular, _, coreModule) {
var inputEl = elem.find('input');
function openDropdown() {
- inputEl.css('width', Math.max(linkEl.width(), 30) + 'px');
+ inputEl.css('width', Math.max(linkEl.width(), 80) + 'px');
inputEl.show();
linkEl.hide();
diff --git a/public/app/core/filters/filters.ts b/public/app/core/filters/filters.ts
index 6122a010182..63f2bf28bc3 100644
--- a/public/app/core/filters/filters.ts
+++ b/public/app/core/filters/filters.ts
@@ -60,8 +60,8 @@ coreModule.filter('noXml', function() {
coreModule.filter('interpolateTemplateVars', function (templateSrv) {
var filterFunc: any = function(text, scope) {
var scopedVars;
- if (scope.ctrl && scope.ctrl.panel) {
- scopedVars = scope.ctrl.panel.scopedVars;
+ if (scope.ctrl) {
+ scopedVars = (scope.ctrl.panel || scope.ctrl.row).scopedVars;
} else {
scopedVars = scope.row.scopedVars;
}
diff --git a/public/app/core/lodash_extended.js b/public/app/core/lodash_extended.js
index 4edae35f02d..6487b19193e 100644
--- a/public/app/core/lodash_extended.js
+++ b/public/app/core/lodash_extended.js
@@ -19,7 +19,7 @@ function () {
return variable === value ? alt : value;
},
toggleInOut: function(array,value) {
- if(_.contains(array,value)) {
+ if(_.includes(array,value)) {
array = _.without(array,value);
} else {
array.push(value);
diff --git a/public/app/core/profiler.ts b/public/app/core/profiler.ts
new file mode 100644
index 00000000000..9b07a1b379d
--- /dev/null
+++ b/public/app/core/profiler.ts
@@ -0,0 +1,126 @@
+///
+
+import $ from 'jquery';
+import _ from 'lodash';
+import angular from 'angular';
+
+export class Profiler {
+ panelsRendered: number;
+ enabled: boolean;
+ panelsInitCount: any;
+ timings: any;
+ digestCounter: any;
+ $rootScope: any;
+ scopeCount: any;
+
+ init(config, $rootScope) {
+ this.enabled = config.buildInfo.env === 'development';
+ this.timings = {};
+ this.timings.appStart = { loadStart: new Date().getTime() };
+ this.$rootScope = $rootScope;
+
+ if (!this.enabled) {
+ return;
+ }
+
+ $rootScope.$watch(() => {
+ this.digestCounter++;
+ return false;
+ }, () => {});
+
+ $rootScope.onAppEvent('refresh', this.refresh.bind(this), $rootScope);
+ $rootScope.onAppEvent('dashboard-fetch-end', this.dashboardFetched.bind(this), $rootScope);
+ $rootScope.onAppEvent('dashboard-initialized', this.dashboardInitialized.bind(this), $rootScope);
+ $rootScope.onAppEvent('panel-initialized', this.panelInitialized.bind(this), $rootScope);
+ }
+
+ refresh() {
+ this.timings.query = 0;
+ this.timings.render = 0;
+
+ setTimeout(() => {
+ console.log('panel count: ' + this.panelsInitCount);
+ console.log('total query: ' + this.timings.query);
+ console.log('total render: ' + this.timings.render);
+ console.log('avg render: ' + this.timings.render / this.panelsInitCount);
+ }, 5000);
+ }
+
+ dashboardFetched() {
+ this.timings.dashboardLoadStart = new Date().getTime();
+ this.panelsInitCount = 0;
+ this.digestCounter = 0;
+ this.panelsInitCount = 0;
+ this.panelsRendered = 0;
+ this.timings.query = 0;
+ this.timings.render = 0;
+ }
+
+ dashboardInitialized() {
+ setTimeout(() => {
+ console.log("Dashboard::Performance Total Digests: " + this.digestCounter);
+ console.log("Dashboard::Performance Total Watchers: " + this.getTotalWatcherCount());
+ console.log("Dashboard::Performance Total ScopeCount: " + this.scopeCount);
+
+ var timeTaken = this.timings.lastPanelInitializedAt - this.timings.dashboardLoadStart;
+ console.log("Dashboard::Performance All panels initialized in " + timeTaken + " ms");
+
+ // measure digest performance
+ var rootDigestStart = window.performance.now();
+ for (var i = 0; i < 30; i++) {
+ this.$rootScope.$apply();
+ }
+
+ console.log("Dashboard::Performance Root Digest " + ((window.performance.now() - rootDigestStart) / 30));
+ }, 3000);
+ }
+
+ getTotalWatcherCount() {
+ var count = 0;
+ var scopes = 0;
+ var root = $(document.getElementsByTagName('body'));
+
+ var f = function (element) {
+ if (element.data().hasOwnProperty('$scope')) {
+ scopes++;
+ angular.forEach(element.data().$scope.$$watchers, function () {
+ count++;
+ });
+ }
+
+ angular.forEach(element.children(), function (childElement) {
+ f($(childElement));
+ });
+ };
+
+ f(root);
+ this.scopeCount = scopes;
+ return count;
+ }
+
+ renderingCompleted(panelId, panelTimings) {
+ // add render counter to root scope
+ // used by phantomjs render.js to know when panel has rendered
+ this.panelsRendered = (this.panelsRendered || 0) + 1;
+ this.$rootScope.panelsRendered = this.panelsRendered;
+
+ if (this.enabled) {
+ panelTimings.renderEnd = new Date().getTime();
+ this.timings.query += panelTimings.queryEnd - panelTimings.queryStart;
+ this.timings.render += panelTimings.renderEnd - panelTimings.renderStart;
+ }
+ }
+
+ panelInitialized() {
+ if (!this.enabled) {
+ return;
+ }
+
+ this.panelsInitCount++;
+ this.timings.lastPanelInitializedAt = new Date().getTime();
+ }
+
+}
+
+var profiler = new Profiler();
+export {profiler};
diff --git a/public/app/core/routes/bundle_loader.ts b/public/app/core/routes/bundle_loader.ts
index 3d275aeda36..473ac66b4b9 100644
--- a/public/app/core/routes/bundle_loader.ts
+++ b/public/app/core/routes/bundle_loader.ts
@@ -2,21 +2,22 @@
export class BundleLoader {
lazy: any;
- loadingDefer: any;
constructor(bundleName) {
+ var defer = null;
+
this.lazy = ["$q", "$route", "$rootScope", ($q, $route, $rootScope) => {
- if (this.loadingDefer) {
- return this.loadingDefer.promise;
+ if (defer) {
+ return defer.promise;
}
- this.loadingDefer = $q.defer();
+ defer = $q.defer();
System.import(bundleName).then(() => {
- this.loadingDefer.resolve();
+ defer.resolve();
});
- return this.loadingDefer.promise;
+ return defer.promise;
}];
}
diff --git a/public/app/core/routes/dashboard_loaders.js b/public/app/core/routes/dashboard_loaders.js
index 8e2157ad84b..728b7e0092f 100644
--- a/public/app/core/routes/dashboard_loaders.js
+++ b/public/app/core/routes/dashboard_loaders.js
@@ -4,13 +4,18 @@ define([
function (coreModule) {
"use strict";
- coreModule.default.controller('LoadDashboardCtrl', function($scope, $routeParams, dashboardLoaderSrv, backendSrv) {
+ coreModule.default.controller('LoadDashboardCtrl', function($scope, $routeParams, dashboardLoaderSrv, backendSrv, $location) {
+ $scope.appEvent("dashboard-fetch-start");
if (!$routeParams.slug) {
- backendSrv.get('/api/dashboards/home').then(function(result) {
- var meta = result.meta;
- meta.canSave = meta.canShare = meta.canStar = false;
- $scope.initDashboard(result, $scope);
+ backendSrv.get('/api/dashboards/home').then(function(homeDash) {
+ if (homeDash.redirectUri) {
+ $location.path('dashboard/' + homeDash.redirectUri);
+ } else {
+ var meta = homeDash.meta;
+ meta.canSave = meta.canShare = meta.canStar = false;
+ $scope.initDashboard(homeDash, $scope);
+ }
});
return;
}
@@ -21,24 +26,19 @@ function (coreModule) {
});
- coreModule.default.controller('DashFromImportCtrl', function($scope, $location, alertSrv) {
- if (!window.grafanaImportDashboard) {
- alertSrv.set('Not found', 'Cannot reload page with unsaved imported dashboard', 'warning', 7000);
- $location.path('');
- return;
- }
- $scope.initDashboard({
- meta: { canShare: false, canStar: false },
- dashboard: window.grafanaImportDashboard
- }, $scope);
- });
-
coreModule.default.controller('NewDashboardCtrl', function($scope) {
$scope.initDashboard({
- meta: { canStar: false, canShare: false },
+ meta: { canStar: false, canShare: false, isNew: true },
dashboard: {
title: "New dashboard",
- rows: [{ height: '250px', panels:[] }]
+ rows: [
+ {
+ title: 'Dashboard Row',
+ height: '250px',
+ panels:[],
+ isNew: true,
+ }
+ ]
},
}, $scope);
});
diff --git a/public/app/core/routes/routes.ts b/public/app/core/routes/routes.ts
index 92cf32448a1..28e1dcf1cd1 100644
--- a/public/app/core/routes/routes.ts
+++ b/public/app/core/routes/routes.ts
@@ -13,6 +13,7 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
var loadOrgBundle = new BundleLoader('app/features/org/all');
var loadPluginsBundle = new BundleLoader('app/features/plugins/all');
var loadAdminBundle = new BundleLoader('app/features/admin/admin');
+ var loadAlertingBundle = new BundleLoader('app/features/alerting/all');
$routeProvider
.when('/', {
@@ -30,11 +31,6 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
.when('/dashboard-solo/:type/:slug', {
templateUrl: 'public/app/features/panel/partials/soloPanel.html',
controller : 'SoloPanelCtrl',
- pageClass: 'page-dashboard',
- })
- .when('/dashboard-import/:file', {
- templateUrl: 'public/app/partials/dashboard.html',
- controller : 'DashFromImportCtrl',
reloadOnSearch: false,
pageClass: 'page-dashboard',
})
@@ -44,9 +40,9 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
reloadOnSearch: false,
pageClass: 'page-dashboard',
})
- .when('/import/dashboard', {
- templateUrl: 'public/app/features/dashboard/partials/import.html',
- controller : 'DashboardImportCtrl',
+ .when('/dashboards/list', {
+ templateUrl: 'public/app/features/dashboard/partials/dash_list.html',
+ controller : 'DashListCtrl',
})
.when('/datasources', {
templateUrl: 'public/app/features/plugins/partials/ds_list.html',
@@ -88,16 +84,20 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
resolve: loadOrgBundle,
})
.when('/profile', {
- templateUrl: 'public/app/features/profile/partials/profile.html',
+ templateUrl: 'public/app/features/org/partials/profile.html',
controller : 'ProfileCtrl',
+ controllerAs: 'ctrl',
+ resolve: loadOrgBundle,
})
.when('/profile/password', {
- templateUrl: 'public/app/features/profile/partials/password.html',
+ templateUrl: 'public/app/features/org/partials/change_password.html',
controller : 'ChangePasswordCtrl',
+ resolve: loadOrgBundle,
})
.when('/profile/select-org', {
- templateUrl: 'public/app/features/profile/partials/select_org.html',
+ templateUrl: 'public/app/features/org/partials/select_org.html',
controller : 'SelectOrgCtrl',
+ resolve: loadOrgBundle,
})
// ADMIN
.when('/admin', {
@@ -185,14 +185,38 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
controllerAs: 'ctrl',
resolve: loadPluginsBundle,
})
- .when('/global-alerts', {
- templateUrl: 'public/app/features/dashboard/partials/globalAlerts.html',
- })
.when('/styleguide/:page?', {
controller: 'StyleGuideCtrl',
controllerAs: 'ctrl',
templateUrl: 'public/app/features/styleguide/styleguide.html',
})
+ .when('/alerting', {
+ redirectTo: '/alerting/list'
+ })
+ .when('/alerting/list', {
+ templateUrl: 'public/app/features/alerting/partials/alert_list.html',
+ controller: 'AlertListCtrl',
+ controllerAs: 'ctrl',
+ resolve: loadAlertingBundle,
+ })
+ .when('/alerting/notifications', {
+ templateUrl: 'public/app/features/alerting/partials/notifications_list.html',
+ controller: 'AlertNotificationsListCtrl',
+ controllerAs: 'ctrl',
+ resolve: loadAlertingBundle,
+ })
+ .when('/alerting/notification/new', {
+ templateUrl: 'public/app/features/alerting/partials/notification_edit.html',
+ controller: 'AlertNotificationEditCtrl',
+ controllerAs: 'ctrl',
+ resolve: loadAlertingBundle,
+ })
+ .when('/alerting/notification/:id/edit', {
+ templateUrl: 'public/app/features/alerting/partials/notification_edit.html',
+ controller: 'AlertNotificationEditCtrl',
+ controllerAs: 'ctrl',
+ resolve: loadAlertingBundle,
+ })
.otherwise({
templateUrl: 'public/app/partials/error.html',
controller: 'ErrorCtrl'
diff --git a/public/app/core/services/alert_srv.ts b/public/app/core/services/alert_srv.ts
index 971743b7285..286f03db5f5 100644
--- a/public/app/core/services/alert_srv.ts
+++ b/public/app/core/services/alert_srv.ts
@@ -16,7 +16,7 @@ export class AlertSrv {
init() {
this.$rootScope.onAppEvent('alert-error', (e, alert) => {
- this.set(alert[0], alert[1], 'error', 0);
+ this.set(alert[0], alert[1], 'error', 7000);
}, this.$rootScope);
this.$rootScope.onAppEvent('alert-warning', (e, alert) => {
@@ -27,14 +27,21 @@ export class AlertSrv {
this.set(alert[0], alert[1], 'success', 3000);
}, this.$rootScope);
- appEvents.on('confirm-modal', this.showConfirmModal.bind(this));
+ appEvents.on('alert-error', options => {
+ this.set(options[0], options[1], 'error', 7000);
+ });
- this.$rootScope.onAppEvent('confirm-modal', (e, data) => {
- this.showConfirmModal(data);
- }, this.$rootScope);
+ appEvents.on('confirm-modal', this.showConfirmModal.bind(this));
}
set(title, text, severity, timeout) {
+ if (_.isObject(text)) {
+ console.log('alert error', text);
+ if (text.statusText) {
+ text = `HTTP Error (${text.status}) ${text.statusText}`;
+ }
+ }
+
var newAlert = {
title: title || '',
text: text || '',
@@ -73,13 +80,27 @@ export class AlertSrv {
showConfirmModal(payload) {
var scope = this.$rootScope.$new();
+ scope.onConfirm = function() {
+ payload.onConfirm();
+ scope.dismiss();
+ };
+
+ scope.updateConfirmText = function(value) {
+ scope.confirmTextValid = payload.confirmText.toLowerCase() === value.toLowerCase();
+ };
+
scope.title = payload.title;
scope.text = payload.text;
scope.text2 = payload.text2;
+ scope.confirmText = payload.confirmText;
+
scope.onConfirm = payload.onConfirm;
+ scope.onAltAction = payload.onAltAction;
+ scope.altActionText = payload.altActionText;
scope.icon = payload.icon || "fa-check";
scope.yesText = payload.yesText || "Yes";
scope.noText = payload.noText || "Cancel";
+ scope.confirmTextValid = scope.confirmText ? false : true;
var confirmModal = this.$modal({
template: 'public/app/partials/confirm_modal.html',
diff --git a/public/app/core/services/backend_srv.js b/public/app/core/services/backend_srv.js
deleted file mode 100644
index ff3784ab45e..00000000000
--- a/public/app/core/services/backend_srv.js
+++ /dev/null
@@ -1,142 +0,0 @@
-define([
- 'angular',
- 'lodash',
- '../core_module',
- 'app/core/config',
-],
-function (angular, _, coreModule, config) {
- 'use strict';
-
- coreModule.default.service('backendSrv', function($http, alertSrv, $timeout) {
- var self = this;
-
- this.get = function(url, params) {
- return this.request({ method: 'GET', url: url, params: params });
- };
-
- this.delete = function(url) {
- return this.request({ method: 'DELETE', url: url });
- };
-
- this.post = function(url, data) {
- return this.request({ method: 'POST', url: url, data: data });
- };
-
- this.patch = function(url, data) {
- return this.request({ method: 'PATCH', url: url, data: data });
- };
-
- this.put = function(url, data) {
- return this.request({ method: 'PUT', url: url, data: data });
- };
-
- this._handleError = function(err) {
- return function() {
- if (err.isHandled) {
- return;
- }
-
- var data = err.data || { message: 'Unexpected error' };
- if (_.isString(data)) {
- data = { message: data };
- }
-
- if (err.status === 422) {
- alertSrv.set("Validation failed", data.message, "warning", 4000);
- throw data;
- }
-
- data.severity = 'error';
-
- if (err.status < 500) {
- data.severity = "warning";
- }
-
- if (data.message) {
- alertSrv.set("Problem!", data.message, data.severity, 10000);
- }
-
- throw data;
- };
- };
-
- this.request = function(options) {
- options.retry = options.retry || 0;
- var requestIsLocal = options.url.indexOf('/') === 0;
- var firstAttempt = options.retry === 0;
-
- if (requestIsLocal && !options.hasSubUrl) {
- options.url = config.appSubUrl + options.url;
- options.hasSubUrl = true;
- }
-
- return $http(options).then(function(results) {
- if (options.method !== 'GET') {
- if (results && results.data.message) {
- alertSrv.set(results.data.message, '', 'success', 3000);
- }
- }
- return results.data;
- }, function(err) {
- // handle unauthorized
- if (err.status === 401 && firstAttempt) {
- return self.loginPing().then(function() {
- options.retry = 1;
- return self.request(options);
- });
- }
-
- $timeout(self._handleError(err), 50);
- throw err;
- });
- };
-
- this.datasourceRequest = function(options) {
- options.retry = options.retry || 0;
- var requestIsLocal = options.url.indexOf('/') === 0;
- var firstAttempt = options.retry === 0;
-
- return $http(options).then(null, function(err) {
- // handle unauthorized for backend requests
- if (requestIsLocal && firstAttempt && err.status === 401) {
- return self.loginPing().then(function() {
- options.retry = 1;
- return self.datasourceRequest(options);
- });
- }
-
- //populate error obj on Internal Error
- if (_.isString(err.data) && err.status === 500) {
- err.data = {
- error: err.statusText
- };
- }
-
- // for Prometheus
- if (!err.data.message && _.isString(err.data.error)) {
- err.data.message = err.data.error;
- }
-
- throw err;
- });
- };
-
- this.loginPing = function() {
- return this.request({url: '/api/login/ping', method: 'GET', retry: 1 });
- };
-
- this.search = function(query) {
- return this.get('/api/search', query);
- };
-
- this.getDashboard = function(type, slug) {
- return this.get('/api/dashboards/' + type + '/' + slug);
- };
-
- this.saveDashboard = function(dash, options) {
- options = (options || {});
- return this.post('/api/dashboards/db/', {dashboard: dash, overwrite: options.overwrite === true});
- };
-
- });
-});
diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
new file mode 100644
index 00000000000..9a5ec5d219b
--- /dev/null
+++ b/public/app/core/services/backend_srv.ts
@@ -0,0 +1,184 @@
+///
+
+import angular from 'angular';
+import _ from 'lodash';
+import config from 'app/core/config';
+import coreModule from 'app/core/core_module';
+
+export class BackendSrv {
+ inFlightRequests = {};
+ HTTP_REQUEST_CANCELLED = -1;
+
+ /** @ngInject */
+ constructor(private $http, private alertSrv, private $rootScope, private $q, private $timeout) {
+ }
+
+ get(url, params?) {
+ return this.request({ method: 'GET', url: url, params: params });
+ }
+
+ delete(url) {
+ return this.request({ method: 'DELETE', url: url });
+ }
+
+ post(url, data) {
+ return this.request({ method: 'POST', url: url, data: data });
+ };
+
+ patch(url, data) {
+ return this.request({ method: 'PATCH', url: url, data: data });
+ }
+
+ put(url, data) {
+ return this.request({ method: 'PUT', url: url, data: data });
+ }
+
+ requestErrorHandler(err) {
+ if (err.isHandled) {
+ return;
+ }
+
+ var data = err.data || { message: 'Unexpected error' };
+ if (_.isString(data)) {
+ data = { message: data };
+ }
+
+ if (err.status === 422) {
+ this.alertSrv.set("Validation failed", data.message, "warning", 4000);
+ throw data;
+ }
+
+ data.severity = 'error';
+
+ if (err.status < 500) {
+ data.severity = "warning";
+ }
+
+ if (data.message) {
+ this.alertSrv.set("Problem!", data.message, data.severity, 10000);
+ }
+
+ throw data;
+ }
+
+ request(options) {
+ options.retry = options.retry || 0;
+ var requestIsLocal = options.url.indexOf('/') === 0;
+ var firstAttempt = options.retry === 0;
+
+ if (requestIsLocal && !options.hasSubUrl) {
+ options.url = config.appSubUrl + options.url;
+ options.hasSubUrl = true;
+ }
+
+ return this.$http(options).then(results => {
+ if (options.method !== 'GET') {
+ if (results && results.data.message) {
+ if (options.showSuccessAlert !== false) {
+ this.alertSrv.set(results.data.message, '', 'success', 3000);
+ }
+ }
+ }
+ return results.data;
+ }, err => {
+ // handle unauthorized
+ if (err.status === 401 && firstAttempt) {
+ return this.loginPing().then(() => {
+ options.retry = 1;
+ return this.request(options);
+ });
+ }
+
+ this.$timeout(this.requestErrorHandler.bind(this, err), 50);
+ throw err;
+ });
+ };
+
+ datasourceRequest(options) {
+ options.retry = options.retry || 0;
+
+ // A requestID is provided by the datasource as a unique identifier for a
+ // particular query. If the requestID exists, the promise it is keyed to
+ // is canceled, canceling the previous datasource request if it is still
+ // in-flight.
+ var canceler;
+ if (options.requestId) {
+ canceler = this.inFlightRequests[options.requestId];
+ if (canceler) {
+ canceler.resolve();
+ }
+ // create new canceler
+ canceler = this.$q.defer();
+ options.timeout = canceler.promise;
+ this.inFlightRequests[options.requestId] = canceler;
+ }
+
+ var requestIsLocal = options.url.indexOf('/') === 0;
+ var firstAttempt = options.retry === 0;
+
+ if (requestIsLocal && !options.hasSubUrl && options.retry === 0) {
+ options.url = config.appSubUrl + options.url;
+ }
+
+ if (requestIsLocal && options.headers && options.headers.Authorization) {
+ options.headers['X-DS-Authorization'] = options.headers.Authorization;
+ delete options.headers.Authorization;
+ }
+
+ return this.$http(options).catch(err => {
+ if (err.status === this.HTTP_REQUEST_CANCELLED) {
+ throw {err, cancelled: true};
+ }
+
+ // handle unauthorized for backend requests
+ if (requestIsLocal && firstAttempt && err.status === 401) {
+ return this.loginPing().then(() => {
+ options.retry = 1;
+ if (canceler) {
+ canceler.resolve();
+ }
+ return this.datasourceRequest(options);
+ });
+ }
+
+ //populate error obj on Internal Error
+ if (_.isString(err.data) && err.status === 500) {
+ err.data = {
+ error: err.statusText,
+ response: err.data,
+ };
+ }
+
+ // for Prometheus
+ if (!err.data.message && _.isString(err.data.error)) {
+ err.data.message = err.data.error;
+ }
+
+ throw err;
+ }).finally(() => {
+ // clean up
+ if (options.requestId) {
+ delete this.inFlightRequests[options.requestId];
+ }
+ });
+ };
+
+ loginPing() {
+ return this.request({url: '/api/login/ping', method: 'GET', retry: 1 });
+ }
+
+ search(query) {
+ return this.get('/api/search', query);
+ }
+
+ getDashboard(type, slug) {
+ return this.get('/api/dashboards/' + type + '/' + slug);
+ }
+
+ saveDashboard(dash, options) {
+ options = (options || {});
+ return this.post('/api/dashboards/db/', {dashboard: dash, overwrite: options.overwrite === true});
+ }
+}
+
+coreModule.service('backendSrv', BackendSrv);
diff --git a/public/app/core/services/context_srv.js b/public/app/core/services/context_srv.js
deleted file mode 100644
index b4a133afea3..00000000000
--- a/public/app/core/services/context_srv.js
+++ /dev/null
@@ -1,47 +0,0 @@
-define([
- 'angular',
- 'lodash',
- '../core_module',
- 'app/core/store',
- 'app/core/config',
-],
-function (angular, _, coreModule, store, config) {
- 'use strict';
-
- coreModule.default.service('contextSrv', function() {
-
- function User() {
- if (config.bootData.user) {
- _.extend(this, config.bootData.user);
- }
- }
-
- this.hasRole = function(role) {
- return this.user.orgRole === role;
- };
-
- this.setPinnedState = function(val) {
- this.pinned = val;
- store.set('grafana.sidemenu.pinned', val);
- };
-
- this.toggleSideMenu = function() {
- this.sidemenu = !this.sidemenu;
- if (!this.sidemenu) {
- this.setPinnedState(false);
- }
- };
-
- this.pinned = store.getBool('grafana.sidemenu.pinned', false);
- if (this.pinned) {
- this.sidemenu = true;
- }
-
- this.version = config.buildInfo.version;
- this.lightTheme = false;
- this.user = new User();
- this.isSignedIn = this.user.isSignedIn;
- this.isGrafanaAdmin = this.user.isGrafanaAdmin;
- this.isEditor = this.hasRole('Editor') || this.hasRole('Admin');
- });
-});
diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
new file mode 100644
index 00000000000..3d048e4f869
--- /dev/null
+++ b/public/app/core/services/context_srv.ts
@@ -0,0 +1,73 @@
+///
+
+import config from 'app/core/config';
+import _ from 'lodash';
+import coreModule from 'app/core/core_module';
+import store from 'app/core/store';
+
+export class User {
+ isGrafanaAdmin: any;
+ isSignedIn: any;
+ orgRole: any;
+ timezone: string;
+ helpFlags1: number;
+
+ constructor() {
+ if (config.bootData.user) {
+ _.extend(this, config.bootData.user);
+ }
+ }
+}
+
+export class ContextSrv {
+ pinned: any;
+ version: any;
+ user: User;
+ isSignedIn: any;
+ isGrafanaAdmin: any;
+ isEditor: any;
+ sidemenu: any;
+
+ constructor() {
+ this.pinned = store.getBool('grafana.sidemenu.pinned', false);
+ if (this.pinned) {
+ this.sidemenu = true;
+ }
+
+ if (!config.buildInfo) {
+ config.buildInfo = {};
+ }
+ if (!config.bootData) {
+ config.bootData = {user: {}, settings: {}};
+ }
+
+ this.version = config.buildInfo.version;
+ this.user = new User();
+ this.isSignedIn = this.user.isSignedIn;
+ this.isGrafanaAdmin = this.user.isGrafanaAdmin;
+ this.isEditor = this.hasRole('Editor') || this.hasRole('Admin');
+ }
+
+ hasRole(role) {
+ return this.user.orgRole === role;
+ }
+
+ setPinnedState(val) {
+ this.pinned = val;
+ store.set('grafana.sidemenu.pinned', val);
+ }
+
+ toggleSideMenu() {
+ this.sidemenu = !this.sidemenu;
+ if (!this.sidemenu) {
+ this.setPinnedState(false);
+ }
+ }
+}
+
+var contextSrv = new ContextSrv();
+export {contextSrv};
+
+coreModule.factory('contextSrv', function() {
+ return contextSrv;
+});
diff --git a/public/app/core/services/datasource_srv.js b/public/app/core/services/datasource_srv.js
index 07e3f004d45..b8b94cd286d 100644
--- a/public/app/core/services/datasource_srv.js
+++ b/public/app/core/services/datasource_srv.js
@@ -7,36 +7,11 @@ define([
function (angular, _, coreModule, config) {
'use strict';
- coreModule.default.service('datasourceSrv', function($q, $injector, $rootScope) {
+ coreModule.default.service('datasourceSrv', function($q, $injector, $rootScope, templateSrv) {
var self = this;
this.init = function() {
this.datasources = {};
- this.metricSources = [];
- this.annotationSources = [];
-
- _.each(config.datasources, function(value, key) {
- if (value.meta && value.meta.metrics) {
- self.metricSources.push({
- value: key === config.defaultDatasource ? null : key,
- name: key,
- meta: value.meta,
- });
- }
- if (value.meta && value.meta.annotations) {
- self.annotationSources.push(value);
- }
- });
-
- this.metricSources.sort(function(a, b) {
- if (a.meta.builtIn || a.name > b.name) {
- return 1;
- }
- if (a.name < b.name) {
- return -1;
- }
- return 0;
- });
};
this.get = function(name) {
@@ -44,6 +19,8 @@ function (angular, _, coreModule, config) {
return this.get(config.defaultDatasource);
}
+ name = templateSrv.replace(name);
+
if (this.datasources[name]) {
return $q.when(this.datasources[name]);
}
@@ -89,11 +66,68 @@ function (angular, _, coreModule, config) {
};
this.getAnnotationSources = function() {
- return this.annotationSources;
+ var sources = [];
+
+ this.addDataSourceVariables(sources);
+
+ _.each(config.datasources, function(value) {
+ if (value.meta && value.meta.annotations) {
+ sources.push(value);
+ }
+ });
+
+ return sources;
};
- this.getMetricSources = function() {
- return this.metricSources;
+ this.getMetricSources = function(options) {
+ var metricSources = [];
+
+ _.each(config.datasources, function(value, key) {
+ if (value.meta && value.meta.metrics) {
+ metricSources.push({value: key, name: key, meta: value.meta});
+
+ if (key === config.defaultDatasource) {
+ metricSources.push({value: null, name: 'default', meta: value.meta});
+ }
+ }
+ });
+
+ if (!options || !options.skipVariables) {
+ this.addDataSourceVariables(metricSources);
+ }
+
+ metricSources.sort(function(a, b) {
+ if (a.meta.builtIn || a.name > b.name) {
+ return 1;
+ }
+ if (a.name < b.name) {
+ return -1;
+ }
+ return 0;
+ });
+
+ return metricSources;
+ };
+
+ this.addDataSourceVariables = function(list) {
+ // look for data source variables
+ for (var i = 0; i < templateSrv.variables.length; i++) {
+ var variable = templateSrv.variables[i];
+ if (variable.type !== 'datasource') {
+ continue;
+ }
+
+ var first = variable.current.value;
+ var ds = config.datasources[first];
+
+ if (ds) {
+ list.push({
+ name: '$' + variable.name,
+ value: '$' + variable.name,
+ meta: ds.meta,
+ });
+ }
+ }
};
this.init();
diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
new file mode 100644
index 00000000000..7cff30ee903
--- /dev/null
+++ b/public/app/core/services/keybindingSrv.ts
@@ -0,0 +1,223 @@
+///
+
+import $ from 'jquery';
+import _ from 'lodash';
+
+import coreModule from 'app/core/core_module';
+import appEvents from 'app/core/app_events';
+
+import Mousetrap from 'mousetrap';
+
+export class KeybindingSrv {
+ helpModal: boolean;
+
+ /** @ngInject */
+ constructor(
+ private $rootScope,
+ private $modal,
+ private $location,
+ private contextSrv,
+ private $timeout) {
+
+ // clear out all shortcuts on route change
+ $rootScope.$on('$routeChangeSuccess', () => {
+ Mousetrap.reset();
+ // rebind global shortcuts
+ this.setupGlobal();
+ });
+
+ this.setupGlobal();
+ }
+
+ setupGlobal() {
+ this.bind(['?', 'h'], this.showHelpModal);
+ this.bind("g h", this.goToHome);
+ this.bind("g a", this.openAlerting);
+ this.bind("g p", this.goToProfile);
+ this.bind("s s", this.openSearchStarred);
+ this.bind('s o', this.openSearch);
+ this.bind('s t', this.openSearchTags);
+ this.bind('f', this.openSearch);
+ }
+
+ openSearchStarred() {
+ this.$rootScope.appEvent('show-dash-search', {starred: true});
+ }
+
+ openSearchTags() {
+ this.$rootScope.appEvent('show-dash-search', {tagsMode: true});
+ }
+
+ openSearch() {
+ this.$rootScope.appEvent('show-dash-search');
+ }
+
+ openAlerting() {
+ this.$location.url("/alerting");
+ }
+
+ goToHome() {
+ this.$location.url("/");
+ }
+
+ goToProfile() {
+ this.$location.url("/profile");
+ }
+
+ showHelpModal() {
+ appEvents.emit('show-modal', {templateHtml: '
'});
+ }
+
+ bind(keyArg, fn) {
+ Mousetrap.bind(keyArg, evt => {
+ evt.preventDefault();
+ evt.stopPropagation();
+ evt.returnValue = false;
+ return this.$rootScope.$apply(fn.bind(this));
+ });
+ }
+
+ showDashEditView(view) {
+ var search = _.extend(this.$location.search(), {editview: view});
+ this.$location.search(search);
+ }
+
+ setupDashboardBindings(scope, dashboard) {
+ // this.bind('b', () => {
+ // dashboard.toggleEditMode();
+ // });
+
+ this.bind('mod+o', () => {
+ dashboard.graphTooltip = (dashboard.graphTooltip + 1) % 3;
+ appEvents.emit('graph-hover-clear');
+ scope.broadcastRefresh();
+ });
+
+ this.bind('mod+h', () => {
+ dashboard.hideControls = !dashboard.hideControls;
+ });
+
+ this.bind('mod+s', e => {
+ scope.appEvent('save-dashboard');
+ });
+
+ this.bind('t z', () => {
+ scope.appEvent('zoom-out', 2);
+ });
+
+ this.bind('ctrl+z', () => {
+ scope.appEvent('zoom-out', 2);
+ });
+
+ this.bind('t left', () => {
+ scope.appEvent('shift-time-backward');
+ });
+
+ this.bind('t right', () => {
+ scope.appEvent('shift-time-forward');
+ });
+
+ this.bind('mod+i', () => {
+ scope.appEvent('quick-snapshot');
+ });
+
+ // edit panel
+ this.bind('e', () => {
+ if (dashboard.meta.focusPanelId && dashboard.meta.canEdit) {
+ this.$rootScope.appEvent('panel-change-view', {
+ fullscreen: true,
+ edit: true,
+ panelId: dashboard.meta.focusPanelId,
+ toggle: true
+ });
+ }
+ });
+
+ // view panel
+ this.bind('v', () => {
+ if (dashboard.meta.focusPanelId) {
+ this.$rootScope.appEvent('panel-change-view', {
+ fullscreen: true,
+ edit: null,
+ panelId: dashboard.meta.focusPanelId,
+ toggle: true,
+ });
+ }
+ });
+
+ // delete panel
+ this.bind('p r', () => {
+ if (dashboard.meta.focusPanelId && dashboard.meta.canEdit) {
+ var panelInfo = dashboard.getPanelInfoById(dashboard.meta.focusPanelId);
+ panelInfo.row.removePanel(panelInfo.panel);
+ dashboard.meta.focusPanelId = 0;
+ }
+ });
+
+ // share panel
+ this.bind('p s', () => {
+ if (dashboard.meta.focusPanelId) {
+ var shareScope = scope.$new();
+ var panelInfo = dashboard.getPanelInfoById(dashboard.meta.focusPanelId);
+ shareScope.panel = panelInfo.panel;
+ shareScope.dashboard = dashboard;
+
+ appEvents.emit('show-modal', {
+ src: 'public/app/features/dashboard/partials/shareModal.html',
+ scope: shareScope
+ });
+ }
+ });
+
+ // delete row
+ this.bind('r r', () => {
+ if (dashboard.meta.focusPanelId && dashboard.meta.canEdit) {
+ var panelInfo = dashboard.getPanelInfoById(dashboard.meta.focusPanelId);
+ dashboard.removeRow(panelInfo.row);
+ dashboard.meta.focusPanelId = 0;
+ }
+ });
+
+ // collapse row
+ this.bind('r c', () => {
+ if (dashboard.meta.focusPanelId) {
+ var panelInfo = dashboard.getPanelInfoById(dashboard.meta.focusPanelId);
+ panelInfo.row.toggleCollapse();
+ dashboard.meta.focusPanelId = 0;
+ }
+ });
+
+ this.bind('d r', () => {
+ scope.broadcastRefresh();
+ });
+
+ this.bind('d s', () => {
+ this.showDashEditView('settings');
+ });
+
+ this.bind('d k', () => {
+ appEvents.emit('toggle-kiosk-mode');
+ });
+
+ this.bind('d v', () => {
+ appEvents.emit('toggle-view-mode');
+ });
+
+ this.bind('esc', () => {
+ var popups = $('.popover.in');
+ if (popups.length > 0) {
+ return;
+ }
+ // close modals
+ var modalData = $(".modal").data();
+ if (modalData && modalData.$scope && modalData.$scope.dismiss) {
+ modalData.$scope.dismiss();
+ }
+
+ scope.appEvent('hide-dash-editor');
+ scope.exitFullscreen();
+ });
+ }
+}
+
+coreModule.service('keybindingSrv', KeybindingSrv);
diff --git a/public/app/core/services/keyboard_manager.js b/public/app/core/services/keyboard_manager.js
index d8cab869ec0..b5eefda81a6 100644
--- a/public/app/core/services/keyboard_manager.js
+++ b/public/app/core/services/keyboard_manager.js
@@ -175,17 +175,17 @@ function (angular, _, coreModule) {
// Foreach keys in label (split on +)
for (var i = 0, l = keys.length; k = keys[i], i < l; i++) {
switch (k) {
- case 'ctrl':
- case 'control':
- kp++;
- modifiers.ctrl.wanted = true;
- break;
- case 'shift':
- case 'alt':
- case 'meta':
- kp++;
- modifiers[k].wanted = true;
- break;
+ case 'ctrl':
+ case 'control':
+ kp++;
+ modifiers.ctrl.wanted = true;
+ break;
+ case 'shift':
+ case 'alt':
+ case 'meta':
+ kp++;
+ modifiers[k].wanted = true;
+ break;
}
if (k.length > 1) { // If it is a special key
diff --git a/public/app/core/services/popover_srv.ts b/public/app/core/services/popover_srv.ts
index 4711dc1b23c..73249a67b5b 100644
--- a/public/app/core/services/popover_srv.ts
+++ b/public/app/core/services/popover_srv.ts
@@ -46,9 +46,12 @@ function popoverSrv($compile, $rootScope) {
drop.on('close', () => {
popoverScope.dismiss({fromDropClose: true});
destroyDrop();
+ if (options.onClose) {
+ options.onClose();
+ }
});
- drop.open();
+ setTimeout(() => { drop.open(); }, 10);
};
}
diff --git a/public/app/core/services/segment_srv.js b/public/app/core/services/segment_srv.js
index a0b85a8bfb2..096697052ce 100644
--- a/public/app/core/services/segment_srv.js
+++ b/public/app/core/services/segment_srv.js
@@ -19,15 +19,19 @@ function (angular, _, coreModule) {
if (_.isString(options)) {
this.value = options;
- this.html = $sce.trustAsHtml(this.value);
+ this.html = $sce.trustAsHtml(templateSrv.highlightVariablesAsHtml(this.value));
return;
}
+ // temp hack to work around legacy inconsistency in segment model
+ this.text = options.value;
+
this.cssClass = options.cssClass;
this.custom = options.custom;
this.type = options.type;
this.fake = options.fake;
this.value = options.value;
+ this.selectMode = options.selectMode;
this.type = options.type;
this.expandable = options.expandable;
this.html = options.html || $sce.trustAsHtml(templateSrv.highlightVariablesAsHtml(this.value));
@@ -78,7 +82,7 @@ function (angular, _, coreModule) {
this.transformToSegments = function(addTemplateVars, variableTypeFilter) {
return function(results) {
var segments = _.map(results, function(segment) {
- return self.newSegment({ value: segment.text, expandable: segment.expandable });
+ return self.newSegment({value: segment.text, expandable: segment.expandable});
});
if (addTemplateVars) {
diff --git a/public/app/core/services/util_srv.js b/public/app/core/services/util_srv.js
deleted file mode 100644
index e6bf3ae08bf..00000000000
--- a/public/app/core/services/util_srv.js
+++ /dev/null
@@ -1,31 +0,0 @@
-define([
- 'angular',
- '../core_module',
-],
-function (angular, coreModule) {
- 'use strict';
-
- coreModule.default.service('utilSrv', function($rootScope, $modal, $q) {
-
- this.init = function() {
- $rootScope.onAppEvent('show-modal', this.showModal, $rootScope);
- };
-
- this.showModal = function(e, options) {
- var modal = $modal({
- modalClass: options.modalClass,
- template: options.src,
- persist: false,
- show: false,
- scope: options.scope,
- keyboard: false
- });
-
- $q.when(modal).then(function(modalEl) {
- modalEl.modal('show');
- });
- };
-
- });
-
-});
diff --git a/public/app/core/services/util_srv.ts b/public/app/core/services/util_srv.ts
new file mode 100644
index 00000000000..c043211cefc
--- /dev/null
+++ b/public/app/core/services/util_srv.ts
@@ -0,0 +1,59 @@
+///
+
+import config from 'app/core/config';
+import _ from 'lodash';
+import $ from 'jquery';
+
+import coreModule from 'app/core/core_module';
+import appEvents from 'app/core/app_events';
+
+export class UtilSrv {
+ modalScope: any;
+
+ /** @ngInject */
+ constructor(private $rootScope, private $modal) {
+ }
+
+ init() {
+ appEvents.on('show-modal', this.showModal.bind(this), this.$rootScope);
+ appEvents.on('hide-modal', this.hideModal.bind(this), this.$rootScope);
+ }
+
+ hideModal() {
+ if (this.modalScope && this.modalScope.dismiss) {
+ this.modalScope.dismiss();
+ }
+ }
+
+ showModal(options) {
+ if (this.modalScope && this.modalScope.dismiss) {
+ this.modalScope.dismiss();
+ }
+
+ this.modalScope = options.scope;
+
+ if (options.model) {
+ this.modalScope = this.$rootScope.$new();
+ this.modalScope.model = options.model;
+ } else if (!this.modalScope) {
+ this.modalScope = this.$rootScope.$new();
+ }
+
+ var modal = this.$modal({
+ modalClass: options.modalClass,
+ template: options.src,
+ templateHtml: options.templateHtml,
+ persist: false,
+ show: false,
+ scope: this.modalScope,
+ keyboard: false,
+ backdrop: options.backdrop
+ });
+
+ Promise.resolve(modal).then(function(modalEl) {
+ modalEl.modal('show');
+ });
+ }
+}
+
+coreModule.service('utilSrv', UtilSrv);
diff --git a/public/app/core/table_model.ts b/public/app/core/table_model.ts
index fa0aeccc54b..f3d0b81998f 100644
--- a/public/app/core/table_model.ts
+++ b/public/app/core/table_model.ts
@@ -32,6 +32,8 @@ export default class TableModel {
if (options.desc) {
this.rows.reverse();
this.columns[options.col].desc = true;
+ } else {
+ this.columns[options.col].desc = false;
}
}
}
diff --git a/public/app/core/time_series2.ts b/public/app/core/time_series2.ts
index f5fcf5bd50c..4503be68710 100644
--- a/public/app/core/time_series2.ts
+++ b/public/app/core/time_series2.ts
@@ -31,6 +31,8 @@ export default class TimeSeries {
allIsZero: boolean;
decimals: number;
scaledDecimals: number;
+ hasMsResolution: boolean;
+ isOutsideRange: boolean;
lines: any;
bars: any;
@@ -42,6 +44,7 @@ export default class TimeSeries {
fillBelowTo: any;
transform: any;
flotpairs: any;
+ unit: any;
constructor(opts) {
this.datapoints = opts.datapoints;
@@ -52,6 +55,8 @@ export default class TimeSeries {
this.valueFormater = kbn.valueFormats.none;
this.stats = {};
this.legend = true;
+ this.unit = opts.unit;
+ this.hasMsResolution = this.isMsResolutionNeeded();
}
applySeriesOverrides(overrides) {
@@ -97,6 +102,10 @@ export default class TimeSeries {
this.stats.min = Number.MAX_VALUE;
this.stats.avg = null;
this.stats.current = null;
+ this.stats.first = null;
+ this.stats.delta = 0;
+ this.stats.range = null;
+ this.stats.timeStep = Number.MAX_VALUE;
this.allIsNull = true;
this.allIsZero = true;
@@ -105,11 +114,24 @@ export default class TimeSeries {
var currentTime;
var currentValue;
var nonNulls = 0;
+ var previousTime;
+ var previousValue = 0;
+ var previousDeltaUp = true;
for (var i = 0; i < this.datapoints.length; i++) {
currentValue = this.datapoints[i][0];
currentTime = this.datapoints[i][1];
+ // Due to missing values we could have different timeStep all along the series
+ // so we have to find the minimum one (could occur with aggregators such as ZimSum)
+ if (previousTime !== undefined) {
+ let timeStep = currentTime - previousTime;
+ if (timeStep < this.stats.timeStep) {
+ this.stats.timeStep = timeStep;
+ }
+ }
+ previousTime = currentTime;
+
if (currentValue === null) {
if (ignoreNulls) { continue; }
if (nullAsZero) {
@@ -131,6 +153,24 @@ export default class TimeSeries {
if (currentValue < this.stats.min) {
this.stats.min = currentValue;
}
+ if (this.stats.first === null){
+ this.stats.first = currentValue;
+ }else{
+ if (previousValue > currentValue) { // counter reset
+ previousDeltaUp = false;
+ if (i === this.datapoints.length-1) { // reset on last
+ this.stats.delta += currentValue;
+ }
+ }else{
+ if (previousDeltaUp) {
+ this.stats.delta += currentValue - previousValue; // normal increment
+ } else {
+ this.stats.delta += currentValue; // account for counter reset
+ }
+ previousDeltaUp = true;
+ }
+ }
+ previousValue = currentValue;
}
if (currentValue !== 0) {
@@ -140,10 +180,6 @@ export default class TimeSeries {
result.push([currentTime, currentValue]);
}
- if (this.datapoints.length >= 2) {
- this.stats.timeStep = this.datapoints[1][1] - this.datapoints[0][1];
- }
-
if (this.stats.max === -Number.MAX_VALUE) { this.stats.max = null; }
if (this.stats.min === Number.MAX_VALUE) { this.stats.min = null; }
@@ -154,6 +190,9 @@ export default class TimeSeries {
this.stats.current = result[result.length-2][1];
}
}
+ if (this.stats.max !== null && this.stats.min !== null) {
+ this.stats.range = this.stats.max - this.stats.min;
+ }
this.stats.count = result.length;
return result;
@@ -170,9 +209,9 @@ export default class TimeSeries {
}
isMsResolutionNeeded() {
- for (var i = 0; i
-import {Subject} from 'vendor/npm/rxjs/Subject';
+import EventEmitter from 'eventemitter3';
var hasOwnProp = {}.hasOwnProperty;
@@ -9,48 +9,32 @@ function createName(name) {
}
export class Emitter {
- subjects: any;
+ emitter: any;
constructor() {
- this.subjects = {};
+ this.emitter = new EventEmitter();
}
emit(name, data?) {
- var fnName = createName(name);
- this.subjects[fnName] || (this.subjects[fnName] = new Subject());
- this.subjects[fnName].next(data);
+ this.emitter.emit(name, data);
}
on(name, handler, scope?) {
- var fnName = createName(name);
- this.subjects[fnName] || (this.subjects[fnName] = new Subject());
- var subscription = this.subjects[fnName].subscribe(handler);
+ this.emitter.on(name, handler);
if (scope) {
- scope.$on('$destroy', function() {
- subscription.unsubscribe();
+ var unbind = scope.$on('$destroy', () => {
+ this.emitter.off(name, handler);
+ unbind();
});
}
+ }
- return subscription;
- };
+ removeAllListeners(evt?) {
+ this.emitter.removeAllListeners(evt);
+ }
off(name, handler) {
- var fnName = createName(name);
- if (this.subjects[fnName]) {
- this.subjects[fnName].dispose();
- delete this.subjects[fnName];
- }
- }
-
- dispose() {
- var subjects = this.subjects;
- for (var prop in subjects) {
- if (hasOwnProp.call(subjects, prop)) {
- subjects[prop].dispose();
- }
- }
-
- this.subjects = {};
+ this.emitter.off(name, handler);
}
}
diff --git a/public/app/core/utils/file_export.ts b/public/app/core/utils/file_export.ts
index 944b6ae8a80..0366a76acc2 100644
--- a/public/app/core/utils/file_export.ts
+++ b/public/app/core/utils/file_export.ts
@@ -5,7 +5,7 @@ import _ from 'lodash';
declare var window: any;
export function exportSeriesListToCsv(seriesList) {
- var text = 'Series;Time;Value\n';
+ var text = 'sep=;\nSeries;Time;Value\n';
_.each(seriesList, function(series) {
_.each(series.datapoints, function(dp) {
text += series.alias + ';' + new Date(dp[1]).toISOString() + ';' + dp[0] + '\n';
@@ -15,7 +15,7 @@ export function exportSeriesListToCsv(seriesList) {
};
export function exportSeriesListToCsvColumns(seriesList) {
- var text = 'Time;';
+ var text = 'sep=;\nTime;';
// add header
_.each(seriesList, function(series) {
text += series.alias + ';';
diff --git a/public/app/core/utils/kbn.js b/public/app/core/utils/kbn.js
index 11a544d2708..f37137cfbf8 100644
--- a/public/app/core/utils/kbn.js
+++ b/public/app/core/utils/kbn.js
@@ -1,6 +1,6 @@
define([
'jquery',
- 'lodash',
+ 'lodash'
],
function($, _) {
'use strict';
@@ -8,87 +8,103 @@ function($, _) {
var kbn = {};
kbn.valueFormats = {};
+ kbn.regexEscape = function(value) {
+ return value.replace(/[\\^$*+?.()|[\]{}\/]/g, '\\$&');
+ };
+
///// HELPER FUNCTIONS /////
kbn.round_interval = function(interval) {
switch (true) {
- // 0.3s
- case (interval <= 300):
- return 100; // 0.1s
- // 0.75s
- case (interval <= 750):
- return 500; // 0.5s
- // 1.5s
- case (interval <= 1500):
- return 1000; // 1s
- // 3.5s
- case (interval <= 3500):
- return 2000; // 2s
- // 7.5s
- case (interval <= 7500):
- return 5000; // 5s
- // 12.5s
- case (interval <= 12500):
- return 10000; // 10s
- // 17.5s
- case (interval <= 17500):
- return 15000; // 15s
- // 25s
- case (interval <= 25000):
- return 20000; // 20s
- // 45s
- case (interval <= 45000):
- return 30000; // 30s
- // 1.5m
- case (interval <= 90000):
- return 60000; // 1m
- // 3.5m
- case (interval <= 210000):
- return 120000; // 2m
- // 7.5m
- case (interval <= 450000):
- return 300000; // 5m
- // 12.5m
- case (interval <= 750000):
- return 600000; // 10m
- // 12.5m
- case (interval <= 1050000):
- return 900000; // 15m
- // 25m
- case (interval <= 1500000):
- return 1200000; // 20m
- // 45m
- case (interval <= 2700000):
- return 1800000; // 30m
- // 1.5h
- case (interval <= 5400000):
- return 3600000; // 1h
- // 2.5h
- case (interval <= 9000000):
- return 7200000; // 2h
- // 4.5h
- case (interval <= 16200000):
- return 10800000; // 3h
- // 9h
- case (interval <= 32400000):
- return 21600000; // 6h
- // 24h
- case (interval <= 86400000):
- return 43200000; // 12h
- // 48h
- case (interval <= 172800000):
- return 86400000; // 24h
- // 1w
- case (interval <= 604800000):
- return 86400000; // 24h
- // 3w
- case (interval <= 1814400000):
- return 604800000; // 1w
- // 2y
- case (interval < 3628800000):
- return 2592000000; // 30d
- default:
- return 31536000000; // 1y
+ // 0.015s
+ case (interval <= 15):
+ return 10; // 0.01s
+ // 0.035s
+ case (interval <= 35):
+ return 20; // 0.02s
+ // 0.075s
+ case (interval <= 75):
+ return 50; // 0.05s
+ // 0.15s
+ case (interval <= 150):
+ return 100; // 0.1s
+ // 0.35s
+ case (interval <= 350):
+ return 200; // 0.2s
+ // 0.75s
+ case (interval <= 750):
+ return 500; // 0.5s
+ // 1.5s
+ case (interval <= 1500):
+ return 1000; // 1s
+ // 3.5s
+ case (interval <= 3500):
+ return 2000; // 2s
+ // 7.5s
+ case (interval <= 7500):
+ return 5000; // 5s
+ // 12.5s
+ case (interval <= 12500):
+ return 10000; // 10s
+ // 17.5s
+ case (interval <= 17500):
+ return 15000; // 15s
+ // 25s
+ case (interval <= 25000):
+ return 20000; // 20s
+ // 45s
+ case (interval <= 45000):
+ return 30000; // 30s
+ // 1.5m
+ case (interval <= 90000):
+ return 60000; // 1m
+ // 3.5m
+ case (interval <= 210000):
+ return 120000; // 2m
+ // 7.5m
+ case (interval <= 450000):
+ return 300000; // 5m
+ // 12.5m
+ case (interval <= 750000):
+ return 600000; // 10m
+ // 12.5m
+ case (interval <= 1050000):
+ return 900000; // 15m
+ // 25m
+ case (interval <= 1500000):
+ return 1200000; // 20m
+ // 45m
+ case (interval <= 2700000):
+ return 1800000; // 30m
+ // 1.5h
+ case (interval <= 5400000):
+ return 3600000; // 1h
+ // 2.5h
+ case (interval <= 9000000):
+ return 7200000; // 2h
+ // 4.5h
+ case (interval <= 16200000):
+ return 10800000; // 3h
+ // 9h
+ case (interval <= 32400000):
+ return 21600000; // 6h
+ // 24h
+ case (interval <= 86400000):
+ return 43200000; // 12h
+ // 48h
+ case (interval <= 172800000):
+ return 86400000; // 24h
+ // 1w
+ case (interval <= 604800000):
+ return 86400000; // 24h
+ // 3w
+ case (interval <= 1814400000):
+ return 604800000; // 1w
+ // 2y
+ case (interval < 3628800000):
+ return 2592000000; // 30d
+ default:
+ return 31536000000; // 1y
}
};
@@ -133,7 +149,7 @@ function($, _) {
return str;
};
- kbn.interval_regex = /(\d+(?:\.\d+)?)([Mwdhmsy])/;
+ kbn.interval_regex = /(\d+(?:\.\d+)?)(ms|[Mwdhmsy])/;
// histogram & trends
kbn.intervals_in_seconds = {
@@ -143,7 +159,8 @@ function($, _) {
d: 86400,
h: 3600,
m: 60,
- s: 1
+ s: 1,
+ ms: 0.001
};
kbn.calculateInterval = function(range, resolution, userInterval) {
@@ -156,7 +173,10 @@ function($, _) {
lowLimitMs = kbn.interval_to_ms(lowLimitInterval);
}
else {
- return userInterval;
+ return {
+ intervalMs: kbn.interval_to_ms(userInterval),
+ interval: userInterval,
+ };
}
}
@@ -165,7 +185,10 @@ function($, _) {
intervalMs = lowLimitMs;
}
- return kbn.secondsToHms(intervalMs / 1000);
+ return {
+ intervalMs: intervalMs,
+ interval: kbn.secondsToHms(intervalMs / 1000),
+ };
};
kbn.describe_interval = function (string) {
@@ -354,35 +377,63 @@ function($, _) {
return kbn.toFixed(100*size, decimals) + '%';
};
+ /* Formats the value to hex. Uses float if specified decimals are not 0.
+ * There are two options, one with 0x, and one without */
+
+ kbn.valueFormats.hex = function(value, decimals) {
+ if (value == null) { return ""; }
+ return parseFloat(kbn.toFixed(value, decimals)).toString(16).toUpperCase();
+ };
+
+ kbn.valueFormats.hex0x = function(value, decimals) {
+ if (value == null) { return ""; }
+ var hexString = kbn.valueFormats.hex(value, decimals);
+ if (hexString.substring(0,1) === "-") {
+ return "-0x" + hexString.substring(1);
+ }
+ return "0x" + hexString;
+ };
+
// Currencies
kbn.valueFormats.currencyUSD = kbn.formatBuilders.currency('$');
kbn.valueFormats.currencyGBP = kbn.formatBuilders.currency('£');
kbn.valueFormats.currencyEUR = kbn.formatBuilders.currency('€');
kbn.valueFormats.currencyJPY = kbn.formatBuilders.currency('¥');
+ kbn.valueFormats.currencyRUB = kbn.formatBuilders.currency('₽');
- // Data
+ // Data (Binary)
kbn.valueFormats.bits = kbn.formatBuilders.binarySIPrefix('b');
kbn.valueFormats.bytes = kbn.formatBuilders.binarySIPrefix('B');
kbn.valueFormats.kbytes = kbn.formatBuilders.binarySIPrefix('B', 1);
kbn.valueFormats.mbytes = kbn.formatBuilders.binarySIPrefix('B', 2);
kbn.valueFormats.gbytes = kbn.formatBuilders.binarySIPrefix('B', 3);
+ // Data (Decimal)
+ kbn.valueFormats.decbits = kbn.formatBuilders.decimalSIPrefix('b');
+ kbn.valueFormats.decbytes = kbn.formatBuilders.decimalSIPrefix('B');
+ kbn.valueFormats.deckbytes = kbn.formatBuilders.decimalSIPrefix('B', 1);
+ kbn.valueFormats.decmbytes = kbn.formatBuilders.decimalSIPrefix('B', 2);
+ kbn.valueFormats.decgbytes = kbn.formatBuilders.decimalSIPrefix('B', 3);
+
// Data Rate
kbn.valueFormats.pps = kbn.formatBuilders.decimalSIPrefix('pps');
kbn.valueFormats.bps = kbn.formatBuilders.decimalSIPrefix('bps');
kbn.valueFormats.Bps = kbn.formatBuilders.decimalSIPrefix('Bps');
kbn.valueFormats.KBs = kbn.formatBuilders.decimalSIPrefix('Bs', 1);
- kbn.valueFormats.Kbits = kbn.formatBuilders.decimalSIPrefix('bits', 1);
+ kbn.valueFormats.Kbits = kbn.formatBuilders.decimalSIPrefix('bps', 1);
kbn.valueFormats.MBs = kbn.formatBuilders.decimalSIPrefix('Bs', 2);
- kbn.valueFormats.Mbits = kbn.formatBuilders.decimalSIPrefix('bits', 2);
+ kbn.valueFormats.Mbits = kbn.formatBuilders.decimalSIPrefix('bps', 2);
kbn.valueFormats.GBs = kbn.formatBuilders.decimalSIPrefix('Bs', 3);
- kbn.valueFormats.Gbits = kbn.formatBuilders.decimalSIPrefix('bits', 3);
+ kbn.valueFormats.Gbits = kbn.formatBuilders.decimalSIPrefix('bps', 3);
// Throughput
kbn.valueFormats.ops = kbn.formatBuilders.simpleCountUnit('ops');
kbn.valueFormats.rps = kbn.formatBuilders.simpleCountUnit('rps');
kbn.valueFormats.wps = kbn.formatBuilders.simpleCountUnit('wps');
kbn.valueFormats.iops = kbn.formatBuilders.simpleCountUnit('iops');
+ kbn.valueFormats.opm = kbn.formatBuilders.simpleCountUnit('opm');
+ kbn.valueFormats.rpm = kbn.formatBuilders.simpleCountUnit('rpm');
+ kbn.valueFormats.wpm = kbn.formatBuilders.simpleCountUnit('wpm');
// Energy
kbn.valueFormats.watt = kbn.formatBuilders.decimalSIPrefix('W');
@@ -396,6 +447,7 @@ function($, _) {
kbn.valueFormats.ev = kbn.formatBuilders.decimalSIPrefix('eV');
kbn.valueFormats.amp = kbn.formatBuilders.decimalSIPrefix('A');
kbn.valueFormats.volt = kbn.formatBuilders.decimalSIPrefix('V');
+ kbn.valueFormats.dBm = kbn.formatBuilders.decimalSIPrefix('dBm');
// Temperature
kbn.valueFormats.celsius = kbn.formatBuilders.fixedUnit('°C');
@@ -458,6 +510,19 @@ function($, _) {
kbn.valueFormats.s = function(size, decimals, scaledDecimals) {
if (size === null) { return ""; }
+ // Less than 1 µs, devide in ns
+ if (Math.abs(size) < 0.000001) {
+ return kbn.toFixedScaled(size * 1.e9, decimals, scaledDecimals - decimals, -9, " ns");
+ }
+ // Less than 1 ms, devide in µs
+ if (Math.abs(size) < 0.001) {
+ return kbn.toFixedScaled(size * 1.e6, decimals, scaledDecimals - decimals, -6, " µs");
+ }
+ // Less than 1 second, devide in ms
+ if (Math.abs(size) < 1) {
+ return kbn.toFixedScaled(size * 1.e3, decimals, scaledDecimals - decimals, -3, " ms");
+ }
+
if (Math.abs(size) < 60) {
return kbn.toFixed(size, decimals) + " s";
}
@@ -566,6 +631,52 @@ function($, _) {
}
};
+ kbn.toDuration = function(size, decimals, timeScale) {
+ if (size === null) { return ""; }
+ if (size === 0) { return "0 " + timeScale + "s"; }
+ if (size < 0) { return kbn.toDuration(-size, decimals, timeScale) + " ago"; }
+
+ var units = [
+ {short: "y", long: "year"},
+ {short: "M", long: "month"},
+ {short: "w", long: "week"},
+ {short: "d", long: "day"},
+ {short: "h", long: "hour"},
+ {short: "m", long: "minute"},
+ {short: "s", long: "second"},
+ {short: "ms", long: "millisecond"}
+ ];
+ // convert $size to milliseconds
+ // intervals_in_seconds uses seconds (duh), convert them to milliseconds here to minimize floating point errors
+ size *= kbn.intervals_in_seconds[units.find(function(e) { return e.long === timeScale; }).short] * 1000;
+
+ var string = [];
+ // after first value >= 1 print only $decimals more
+ var decrementDecimals = false;
+ for (var i = 0; i < units.length && decimals >= 0; i++) {
+ var interval = kbn.intervals_in_seconds[units[i].short] * 1000;
+ var value = size / interval;
+ if (value >= 1 || decrementDecimals) {
+ decrementDecimals = true;
+ var floor = Math.floor(value);
+ var unit = units[i].long + (floor !== 1 ? "s" : "");
+ string.push(floor + " " + unit);
+ size = size % interval;
+ decimals--;
+ }
+ }
+
+ return string.join(", ");
+ };
+
+ kbn.valueFormats.dtdurationms = function(size, decimals) {
+ return kbn.toDuration(size, decimals, 'millisecond');
+ };
+
+ kbn.valueFormats.dtdurations = function(size, decimals) {
+ return kbn.toDuration(size, decimals, 'second');
+ };
+
///// FORMAT MENU /////
kbn.getUnitFormats = function() {
@@ -580,6 +691,8 @@ function($, _) {
{text: 'Humidity (%H)', value: 'humidity' },
{text: 'ppm', value: 'ppm' },
{text: 'decibel', value: 'dB' },
+ {text: 'hexadecimal (0x)', value: 'hex0x' },
+ {text: 'hexadecimal', value: 'hex' },
]
},
{
@@ -589,6 +702,7 @@ function($, _) {
{text: 'Pounds (£)', value: 'currencyGBP'},
{text: 'Euro (€)', value: 'currencyEUR'},
{text: 'Yen (¥)', value: 'currencyJPY'},
+ {text: 'Rubles (₽)', value: 'currencyRUB'},
]
},
{
@@ -602,16 +716,28 @@ function($, _) {
{text: 'minutes (m)', value: 'm' },
{text: 'hours (h)', value: 'h' },
{text: 'days (d)', value: 'd' },
+ {text: 'duration (ms)', value: 'dtdurationms' },
+ {text: 'duration (s)', value: 'dtdurations' }
]
},
{
- text: 'data',
+ text: 'data (IEC)',
submenu: [
{text: 'bits', value: 'bits' },
{text: 'bytes', value: 'bytes' },
- {text: 'kilobytes', value: 'kbytes'},
- {text: 'megabytes', value: 'mbytes'},
- {text: 'gigabytes', value: 'gbytes'},
+ {text: 'kibibytes', value: 'kbytes'},
+ {text: 'mebibytes', value: 'mbytes'},
+ {text: 'gibibytes', value: 'gbytes'},
+ ]
+ },
+ {
+ text: 'data (Metric)',
+ submenu: [
+ {text: 'bits', value: 'decbits' },
+ {text: 'bytes', value: 'decbytes' },
+ {text: 'kilobytes', value: 'deckbytes'},
+ {text: 'megabytes', value: 'decmbytes'},
+ {text: 'gigabytes', value: 'decgbytes'},
]
},
{
@@ -635,6 +761,9 @@ function($, _) {
{text: 'reads/sec (rps)', value: 'rps' },
{text: 'writes/sec (wps)', value: 'wps' },
{text: 'I/O ops/sec (iops)', value: 'iops'},
+ {text: 'ops/min (opm)', value: 'opm' },
+ {text: 'reads/min (rpm)', value: 'rpm' },
+ {text: 'writes/min (wpm)', value: 'wpm' },
]
},
{
@@ -677,6 +806,7 @@ function($, _) {
{text: 'electron volt (eV)', value: 'ev' },
{text: 'Ampere (A)', value: 'amp' },
{text: 'Volt (V)', value: 'volt' },
+ {text: 'Decibel-milliwatt (dBm)', value: 'dBm' },
]
},
{
diff --git a/public/app/core/utils/model_utils.ts b/public/app/core/utils/model_utils.ts
new file mode 100644
index 00000000000..dd620aff53d
--- /dev/null
+++ b/public/app/core/utils/model_utils.ts
@@ -0,0 +1,10 @@
+export function assignModelProperties(target, source, defaults, removeDefaults?) {
+ for (var key in defaults) {
+ if (!defaults.hasOwnProperty(key)) {
+ continue;
+ }
+
+ target[key] = source[key] === undefined ? defaults[key] : source[key];
+ }
+}
+
diff --git a/public/app/core/utils/rangeutil.ts b/public/app/core/utils/rangeutil.ts
index 7f2f2fd72b1..ea9ad111e8d 100644
--- a/public/app/core/utils/rangeutil.ts
+++ b/public/app/core/utils/rangeutil.ts
@@ -38,10 +38,10 @@ var rangeOptions = [
{ from: 'now-12h', to: 'now', display: 'Last 12 hours', section: 3 },
{ from: 'now-24h', to: 'now', display: 'Last 24 hours', section: 3 },
+ { from: 'now-2d', to: 'now', display: 'Last 2 days', section: 0 },
{ from: 'now-7d', to: 'now', display: 'Last 7 days', section: 0 },
{ from: 'now-30d', to: 'now', display: 'Last 30 days', section: 0 },
{ from: 'now-60d', to: 'now', display: 'Last 60 days', section: 0 },
- { from: 'now-90d', to: 'now', display: 'Last 90 days', section: 0 },
{ from: 'now-6M', to: 'now', display: 'Last 6 months', section: 0 },
{ from: 'now-1y', to: 'now', display: 'Last 1 year', section: 0 },
{ from: 'now-2y', to: 'now', display: 'Last 2 years', section: 0 },
@@ -82,8 +82,9 @@ function formatDate(date) {
// now/d
// if no to
then to now is assumed
export function describeTextRange(expr: any) {
+ let isLast = (expr.indexOf('+') !== 0);
if (expr.indexOf('now') === -1) {
- expr = 'now-' + expr;
+ expr = (isLast ? 'now-' : 'now') + expr;
}
let opt = rangeIndex[expr + ' to now'];
@@ -91,15 +92,20 @@ export function describeTextRange(expr: any) {
return opt;
}
- opt = {from: expr, to: 'now'};
+ if (isLast) {
+ opt = {from: expr, to: 'now'};
+ } else {
+ opt = {from: 'now', to: expr};
+ }
- let parts = /^now-(\d+)(\w)/.exec(expr);
+ let parts = /^now([-+])(\d+)(\w)/.exec(expr);
if (parts) {
- let unit = parts[2];
- let amount = parseInt(parts[1]);
+ let unit = parts[3];
+ let amount = parseInt(parts[2]);
let span = spans[unit];
if (span) {
- opt.display = 'Last ' + amount + ' ' + span.display;
+ opt.display = isLast ? 'Last ' : 'Next ';
+ opt.display += amount + ' ' + span.display;
opt.section = span.section;
if (amount > 1) {
opt.display += 's';
diff --git a/public/app/core/utils/sort_by_keys.ts b/public/app/core/utils/sort_by_keys.ts
new file mode 100644
index 00000000000..9dff252576a
--- /dev/null
+++ b/public/app/core/utils/sort_by_keys.ts
@@ -0,0 +1,17 @@
+import _ from 'lodash';
+
+export default function sortByKeys(input) {
+ if (_.isArray(input)) {
+ return input.map(sortByKeys);
+ }
+
+ if (_.isPlainObject(input)) {
+ var sortedObject = {};
+ for (let key of _.keys(input).sort()) {
+ sortedObject[key] = sortByKeys(input[key]);
+ }
+ return sortedObject;
+ }
+
+ return input;
+}
diff --git a/public/app/features/admin/adminEditUserCtrl.js b/public/app/features/admin/adminEditUserCtrl.js
index d8500a845d3..104ccff99cd 100644
--- a/public/app/features/admin/adminEditUserCtrl.js
+++ b/public/app/features/admin/adminEditUserCtrl.js
@@ -81,20 +81,20 @@ function (angular, _) {
$scope.searchOrgs = function(queryStr, callback) {
if ($scope.orgsSearchCache.length > 0) {
- callback(_.pluck($scope.orgsSearchCache, "name"));
+ callback(_.map($scope.orgsSearchCache, "name"));
return;
}
backendSrv.get('/api/orgs', {query: ''}).then(function(result) {
$scope.orgsSearchCache = result;
- callback(_.pluck(result, "name"));
+ callback(_.map(result, "name"));
});
};
$scope.addOrgUser = function() {
if (!$scope.addOrgForm.$valid) { return; }
- var orgInfo = _.findWhere($scope.orgsSearchCache, {name: $scope.newOrg.name});
+ var orgInfo = _.find($scope.orgsSearchCache, {name: $scope.newOrg.name});
if (!orgInfo) { return; }
$scope.newOrg.loginOrEmail = $scope.user.login;
diff --git a/public/app/features/admin/partials/settings.html b/public/app/features/admin/partials/settings.html
index 5e070f4d3c0..5371670a9ba 100644
--- a/public/app/features/admin/partials/settings.html
+++ b/public/app/features/admin/partials/settings.html
@@ -7,7 +7,7 @@
- These system settings are defined in grafana.ini or grafana.custom.ini (or overriden in ENV variables).
+ These system settings are defined in grafana.ini or custom.ini (or overriden in ENV variables).
To change these you currently need to restart grafana.
diff --git a/public/app/features/admin/partials/stats.html b/public/app/features/admin/partials/stats.html
index 1ad114f50e2..92e32f4f947 100644
--- a/public/app/features/admin/partials/stats.html
+++ b/public/app/features/admin/partials/stats.html
@@ -22,10 +22,6 @@
Total users
{{ctrl.stats.user_count}}
-
- Total grafana admins
- {{ctrl.stats.grafana_admin_count}}
-
Total organizations
{{ctrl.stats.org_count}}
@@ -50,6 +46,10 @@
Total starred dashboards
{{ctrl.stats.starred_db_count}}
+
+ Total alerts
+ {{ctrl.stats.alert_count}}
+
diff --git a/public/app/features/alerting/alert_def.ts b/public/app/features/alerting/alert_def.ts
new file mode 100644
index 00000000000..e6bd75379b2
--- /dev/null
+++ b/public/app/features/alerting/alert_def.ts
@@ -0,0 +1,141 @@
+///
+
+
+
+
+
+
+
+
+ Alerts are added and configured in the Alert Tab of any dashboard
+ graph panel, letting you build and visualize an alert using existing queries.
+ Go to Home Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ for {{alert.newStateDateAgo}}
+
+
+ {{alert.executionError}}
+
+
+
+
+
+
+
+
+
+
+ Notification channels
+
+
+
+
diff --git a/public/app/features/alerting/partials/notifications_list.html b/public/app/features/alerting/partials/notifications_list.html
new file mode 100644
index 00000000000..32ac4a44476
--- /dev/null
+++ b/public/app/features/alerting/partials/notifications_list.html
@@ -0,0 +1,43 @@
+
+
+
+
diff --git a/public/app/features/alerting/specs/alert_tab_specs.ts b/public/app/features/alerting/specs/alert_tab_specs.ts
new file mode 100644
index 00000000000..3c407297dee
--- /dev/null
+++ b/public/app/features/alerting/specs/alert_tab_specs.ts
@@ -0,0 +1,20 @@
+import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
+
+import {AlertTabCtrl} from '../alert_tab_ctrl';
+import helpers from '../../../../test/specs/helpers';
+
+describe('AlertTabCtrl', () => {
+ var $scope = {
+ ctrl: {}
+ };
+
+ describe('with null parameters', () => {
+ it('can be created', () => {
+ var alertTab = new AlertTabCtrl($scope, null, null, null, null, null, null, null);
+
+ expect(alertTab).to.not.be(null);
+ });
+ });
+});
+
+
diff --git a/public/app/features/alerting/specs/threshold_mapper_specs.ts b/public/app/features/alerting/specs/threshold_mapper_specs.ts
new file mode 100644
index 00000000000..1f42fb84840
--- /dev/null
+++ b/public/app/features/alerting/specs/threshold_mapper_specs.ts
@@ -0,0 +1,78 @@
+import {describe, beforeEach, it, sinon, expect} from 'test/lib/common';
+
+import {ThresholdMapper} from '../threshold_mapper';
+
+describe('ThresholdMapper', () => {
+
+ describe('with greater than evaluator', () => {
+ it('can mapp query conditions to thresholds', () => {
+ var panel: any = {
+ type: 'graph',
+ alert: {
+ conditions: [
+ {
+ type: 'query',
+ evaluator: { type: 'gt', params: [100], }
+ }
+ ]
+ }
+ };
+
+ var updated = ThresholdMapper.alertToGraphThresholds(panel);
+ expect(updated).to.be(true);
+ expect(panel.thresholds[0].op).to.be('gt');
+ expect(panel.thresholds[0].value).to.be(100);
+ });
+ });
+
+ describe('with outside range evaluator', () => {
+ it('can mapp query conditions to thresholds', () => {
+ var panel: any = {
+ type: 'graph',
+ alert: {
+ conditions: [
+ {
+ type: 'query',
+ evaluator: { type: 'outside_range', params: [100, 200], }
+ }
+ ]
+ }
+ };
+
+ var updated = ThresholdMapper.alertToGraphThresholds(panel);
+ expect(updated).to.be(true);
+ expect(panel.thresholds[0].op).to.be('lt');
+ expect(panel.thresholds[0].value).to.be(100);
+
+ expect(panel.thresholds[1].op).to.be('gt');
+ expect(panel.thresholds[1].value).to.be(200);
+ });
+ });
+
+ describe('with inside range evaluator', () => {
+ it('can mapp query conditions to thresholds', () => {
+ var panel: any = {
+ type: 'graph',
+ alert: {
+ conditions: [
+ {
+ type: 'query',
+ evaluator: { type: 'within_range', params: [100, 200], }
+ }
+ ]
+ }
+ };
+
+ var updated = ThresholdMapper.alertToGraphThresholds(panel);
+ expect(updated).to.be(true);
+ expect(panel.thresholds[0].op).to.be('gt');
+ expect(panel.thresholds[0].value).to.be(100);
+
+ expect(panel.thresholds[1].op).to.be('lt');
+ expect(panel.thresholds[1].value).to.be(200);
+ });
+ });
+
+});
+
+
diff --git a/public/app/features/alerting/threshold_mapper.ts b/public/app/features/alerting/threshold_mapper.ts
new file mode 100644
index 00000000000..b14f9a4d933
--- /dev/null
+++ b/public/app/features/alerting/threshold_mapper.ts
@@ -0,0 +1,72 @@
+
+export class ThresholdMapper {
+
+ static alertToGraphThresholds(panel) {
+ var alert = panel.alert;
+
+ if (panel.type !== 'graph') {
+ return false;
+ }
+
+ for (var i = 0; i < panel.alert.conditions.length; i++) {
+ let condition = panel.alert.conditions[i];
+ if (condition.type !== 'query') {
+ continue;
+ }
+
+ var evaluator = condition.evaluator;
+ var thresholds = panel.thresholds = [];
+
+ switch (evaluator.type) {
+ case "gt": {
+ let value = evaluator.params[0];
+ thresholds.push({value: value, op: 'gt'});
+ break;
+ }
+ case "lt": {
+ let value = evaluator.params[0];
+ thresholds.push({value: value, op: 'lt'});
+ break;
+ }
+ case "outside_range": {
+ let value1 = evaluator.params[0];
+ let value2 = evaluator.params[1];
+
+ if (value1 > value2) {
+ thresholds.push({value: value1, op: 'gt'});
+ thresholds.push({value: value2, op: 'lt'});
+ } else {
+ thresholds.push({value: value1, op: 'lt'});
+ thresholds.push({value: value2, op: 'gt'});
+ }
+
+ break;
+ }
+ case "within_range": {
+ let value1 = evaluator.params[0];
+ let value2 = evaluator.params[1];
+
+ if (value1 > value2) {
+ thresholds.push({value: value1, op: 'lt'});
+ thresholds.push({value: value2, op: 'gt'});
+ } else {
+ thresholds.push({value: value1, op: 'gt'});
+ thresholds.push({value: value2, op: 'lt'});
+ }
+ break;
+ }
+ }
+ break;
+ }
+
+ for (var t of panel.thresholds) {
+ t.fill = true;
+ t.line = true;
+ t.colorMode = 'critical';
+ }
+
+ var updated = true;
+ return updated;
+ }
+
+}
diff --git a/public/app/features/all.js b/public/app/features/all.js
index c110bcff7cd..cd7adb49de6 100644
--- a/public/app/features/all.js
+++ b/public/app/features/all.js
@@ -2,13 +2,10 @@ define([
'./panellinks/module',
'./dashlinks/module',
'./annotations/annotations_srv',
- './templating/templateSrv',
+ './templating/all',
'./dashboard/all',
'./playlist/all',
'./snapshot/all',
'./panel/all',
- './profile/profileCtrl',
- './profile/changePasswordCtrl',
- './profile/selectOrgCtrl',
'./styleguide/styleguide',
], function () {});
diff --git a/public/app/features/annotations/annotations_srv.js b/public/app/features/annotations/annotations_srv.js
deleted file mode 100644
index b0022135ef5..00000000000
--- a/public/app/features/annotations/annotations_srv.js
+++ /dev/null
@@ -1,97 +0,0 @@
-define([
- 'angular',
- 'lodash',
- './editor_ctrl',
-], function (angular, _) {
- 'use strict';
-
- var module = angular.module('grafana.services');
-
- module.service('annotationsSrv', function($rootScope, $q, datasourceSrv, alertSrv, timeSrv) {
- var promiseCached;
- var list = [];
- var self = this;
-
- this.init = function() {
- $rootScope.onAppEvent('refresh', this.clearCache, $rootScope);
- $rootScope.onAppEvent('dashboard-loaded', this.clearCache, $rootScope);
- };
-
- this.clearCache = function() {
- promiseCached = null;
- list = [];
- };
-
- this.getAnnotations = function(dashboard) {
- if (dashboard.annotations.list.length === 0) {
- return $q.when(null);
- }
-
- if (promiseCached) {
- return promiseCached;
- }
-
- self.dashboard = dashboard;
- var annotations = _.where(dashboard.annotations.list, {enable: true});
-
- var range = timeSrv.timeRange();
- var rangeRaw = timeSrv.timeRange(false);
-
- var promises = _.map(annotations, function(annotation) {
- if (annotation.snapshotData) {
- self.receiveAnnotationResults(annotation.snapshotData);
- return;
- }
- return datasourceSrv.get(annotation.datasource).then(function(datasource) {
- var query = {range: range, rangeRaw: rangeRaw, annotation: annotation};
- return datasource.annotationQuery(query)
- .then(self.receiveAnnotationResults)
- .then(function(results) {
- if (dashboard.snapshot) {
- annotation.snapshotData = angular.copy(results);
- }
- })
- .then(null, errorHandler);
- }, this);
- });
-
- promiseCached = $q.all(promises)
- .then(function() {
- return list;
- });
-
- return promiseCached;
- };
-
- this.receiveAnnotationResults = function(results) {
- for (var i = 0; i < results.length; i++) {
- self.addAnnotation(results[i]);
- }
-
- return results;
- };
-
- this.addAnnotation = function(options) {
- list.push({
- annotation: options.annotation,
- min: options.time,
- max: options.time,
- eventType: options.annotation.name,
- title: options.title,
- tags: options.tags,
- text: options.text,
- score: 1
- });
- };
-
- function errorHandler(err) {
- console.log('Annotation error: ', err);
- var message = err.message || "Annotation query failed";
- alertSrv.set('Annotations error', message,'error');
- }
-
- // Now init
- this.init();
- });
-
-});
diff --git a/public/app/features/annotations/annotations_srv.ts b/public/app/features/annotations/annotations_srv.ts
new file mode 100644
index 00000000000..759e4500c7d
--- /dev/null
+++ b/public/app/features/annotations/annotations_srv.ts
@@ -0,0 +1,141 @@
+///
+
-
-
+
+
No annotations defined
-
+
-
-
+
-
+
@@ -54,43 +54,43 @@
-
+
-
+
diff --git a/public/app/features/dashboard/ad_hoc_filters.ts b/public/app/features/dashboard/ad_hoc_filters.ts
new file mode 100644
index 00000000000..f962f8ca2f4
--- /dev/null
+++ b/public/app/features/dashboard/ad_hoc_filters.ts
@@ -0,0 +1,171 @@
+///
+
+import _ from 'lodash';
+import angular from 'angular';
+import coreModule from 'app/core/core_module';
+
+export class AdHocFiltersCtrl {
+ segments: any;
+ variable: any;
+ removeTagFilterSegment: any;
+
+ /** @ngInject */
+ constructor(private uiSegmentSrv, private datasourceSrv, private $q, private templateSrv, private $rootScope) {
+ this.removeTagFilterSegment = uiSegmentSrv.newSegment({fake: true, value: '-- remove filter --'});
+ this.buildSegmentModel();
+ }
+
+ buildSegmentModel() {
+ this.segments = [];
+
+ if (this.variable.value && !_.isArray(this.variable.value)) {
+ }
+
+ for (let tag of this.variable.filters) {
+ if (this.segments.length > 0) {
+ this.segments.push(this.uiSegmentSrv.newCondition('AND'));
+ }
+
+ if (tag.key !== undefined && tag.value !== undefined) {
+ this.segments.push(this.uiSegmentSrv.newKey(tag.key));
+ this.segments.push(this.uiSegmentSrv.newOperator(tag.operator));
+ this.segments.push(this.uiSegmentSrv.newKeyValue(tag.value));
+ }
+ }
+
+ this.segments.push(this.uiSegmentSrv.newPlusButton());
+ }
+
+ getOptions(segment, index) {
+ if (segment.type === 'operator') {
+ return this.$q.when(this.uiSegmentSrv.newOperators(['=', '!=', '<', '>', '=~', '!~']));
+ }
+
+ if (segment.type === 'condition') {
+ return this.$q.when([this.uiSegmentSrv.newSegment('AND')]);
+ }
+
+ return this.datasourceSrv.get(this.variable.datasource).then(ds => {
+ var options: any = {};
+ var promise = null;
+
+ if (segment.type !== 'value') {
+ promise = ds.getTagKeys();
+ } else {
+ options.key = this.segments[index-2].value;
+ promise = ds.getTagValues(options);
+ }
+
+ return promise.then(results => {
+ results = _.map(results, segment => {
+ return this.uiSegmentSrv.newSegment({value: segment.text});
+ });
+
+ // add remove option for keys
+ if (segment.type === 'key') {
+ results.splice(0, 0, angular.copy(this.removeTagFilterSegment));
+ }
+ return results;
+ });
+ });
+ }
+
+ segmentChanged(segment, index) {
+ this.segments[index] = segment;
+
+ // handle remove tag condition
+ if (segment.value === this.removeTagFilterSegment.value) {
+ this.segments.splice(index, 3);
+ if (this.segments.length === 0) {
+ this.segments.push(this.uiSegmentSrv.newPlusButton());
+ } else if (this.segments.length > 2) {
+ this.segments.splice(Math.max(index-1, 0), 1);
+ if (this.segments[this.segments.length-1].type !== 'plus-button') {
+ this.segments.push(this.uiSegmentSrv.newPlusButton());
+ }
+ }
+ } else {
+ if (segment.type === 'plus-button') {
+ if (index > 2) {
+ this.segments.splice(index, 0, this.uiSegmentSrv.newCondition('AND'));
+ }
+ this.segments.push(this.uiSegmentSrv.newOperator('='));
+ this.segments.push(this.uiSegmentSrv.newFake('select tag value', 'value', 'query-segment-value'));
+ segment.type = 'key';
+ segment.cssClass = 'query-segment-key';
+ }
+
+ if ((index+1) === this.segments.length) {
+ this.segments.push(this.uiSegmentSrv.newPlusButton());
+ }
+ }
+
+ this.updateVariableModel();
+ }
+
+ updateVariableModel() {
+ var filters = [];
+ var filterIndex = -1;
+ var operator = "";
+ var hasFakes = false;
+
+ this.segments.forEach(segment => {
+ if (segment.type === 'value' && segment.fake) {
+ hasFakes = true;
+ return;
+ }
+
+ switch (segment.type) {
+ case 'key': {
+ filters.push({key: segment.value});
+ filterIndex += 1;
+ break;
+ }
+ case 'value': {
+ filters[filterIndex].value = segment.value;
+ break;
+ }
+ case 'operator': {
+ filters[filterIndex].operator = segment.value;
+ break;
+ }
+ case 'condition': {
+ filters[filterIndex].condition = segment.value;
+ break;
+ }
+ }
+ });
+
+ if (hasFakes) {
+ return;
+ }
+
+ this.variable.setFilters(filters);
+ this.$rootScope.$emit('template-variable-value-updated');
+ this.$rootScope.$broadcast('refresh');
+ }
+}
+
+var template = `
+
+`;
+
+export function adHocFiltersComponent() {
+ return {
+ restrict: 'E',
+ template: template,
+ controller: AdHocFiltersCtrl,
+ bindToController: true,
+ controllerAs: 'ctrl',
+ scope: {
+ variable: "="
+ }
+ };
+}
+
+coreModule.directive('adHocFilters', adHocFiltersComponent);
diff --git a/public/app/features/dashboard/alerting_srv.ts b/public/app/features/dashboard/alerting_srv.ts
new file mode 100644
index 00000000000..0e1c160b726
--- /dev/null
+++ b/public/app/features/dashboard/alerting_srv.ts
@@ -0,0 +1,22 @@
+///
+
+import config from 'app/core/config';
+import angular from 'angular';
+import moment from 'moment';
+import _ from 'lodash';
+
+import coreModule from 'app/core/core_module';
+
+export class AlertingSrv {
+ dashboard: any;
+ alerts: any[];
+
+ init(dashboard, alerts) {
+ this.dashboard = dashboard;
+ this.alerts = alerts || [];
+ }
+}
+
+
+coreModule.service('alertingSrv', AlertingSrv);
+
diff --git a/public/app/features/dashboard/all.js b/public/app/features/dashboard/all.js
index d110019add6..976bff07058 100644
--- a/public/app/features/dashboard/all.js
+++ b/public/app/features/dashboard/all.js
@@ -1,20 +1,24 @@
define([
- './dashboardCtrl',
+ './dashboard_ctrl',
+ './alerting_srv',
'./dashboardLoaderSrv',
'./dashnav/dashnav',
'./submenu/submenu',
'./saveDashboardAsCtrl',
- './rowCtrl',
'./shareModalCtrl',
'./shareSnapshotCtrl',
- './dashboardSrv',
- './keybindings',
+ './dashboard_srv',
'./viewStateSrv',
'./timeSrv',
'./unsavedChangesSrv',
'./timepicker/timepicker',
'./graphiteImportCtrl',
- './dynamicDashboardSrv',
- './importCtrl',
'./impression_store',
+ './upload',
+ './import/dash_import',
+ './export/export_modal',
+ './dash_list_ctrl',
+ './ad_hoc_filters',
+ './row/row_ctrl',
+ './repeat_option/repeat_option',
], function () {});
diff --git a/public/app/features/dashboard/dash_list_ctrl.ts b/public/app/features/dashboard/dash_list_ctrl.ts
new file mode 100644
index 00000000000..f08d7507e65
--- /dev/null
+++ b/public/app/features/dashboard/dash_list_ctrl.ts
@@ -0,0 +1,11 @@
+///
+
+import coreModule from 'app/core/core_module';
+
+export class DashListCtrl {
+ /** @ngInject */
+ constructor() {
+ }
+}
+
+coreModule.controller('DashListCtrl', DashListCtrl);
diff --git a/public/app/features/dashboard/dashboardCtrl.js b/public/app/features/dashboard/dashboardCtrl.js
deleted file mode 100644
index ea0d91019b8..00000000000
--- a/public/app/features/dashboard/dashboardCtrl.js
+++ /dev/null
@@ -1,143 +0,0 @@
-define([
- 'angular',
- 'jquery',
- 'app/core/config',
- 'moment',
-],
-function (angular, $, config, moment) {
- "use strict";
-
- var module = angular.module('grafana.controllers');
-
- module.controller('DashboardCtrl', function(
- $scope,
- $rootScope,
- dashboardKeybindings,
- timeSrv,
- templateValuesSrv,
- dynamicDashboardSrv,
- dashboardSrv,
- unsavedChangesSrv,
- dashboardViewStateSrv,
- contextSrv,
- $timeout) {
-
- $scope.editor = { index: 0 };
- $scope.panels = config.panels;
-
- var resizeEventTimeout;
-
- this.init = function(dashboard) {
- $scope.resetRow();
- $scope.registerWindowResizeEvent();
- $scope.onAppEvent('show-json-editor', $scope.showJsonEditor);
- $scope.setupDashboard(dashboard);
- };
-
- $scope.setupDashboard = function(data) {
- $rootScope.performance.dashboardLoadStart = new Date().getTime();
- $rootScope.performance.panelsInitialized = 0;
- $rootScope.performance.panelsRendered = 0;
-
- var dashboard = dashboardSrv.create(data.dashboard, data.meta);
- dashboardSrv.setCurrent(dashboard);
-
- // init services
- timeSrv.init(dashboard);
-
- // template values service needs to initialize completely before
- // the rest of the dashboard can load
- templateValuesSrv.init(dashboard).finally(function() {
- dynamicDashboardSrv.init(dashboard);
- unsavedChangesSrv.init(dashboard, $scope);
-
- $scope.dashboard = dashboard;
- $scope.dashboardMeta = dashboard.meta;
- $scope.dashboardViewState = dashboardViewStateSrv.create($scope);
-
- dashboardKeybindings.shortcuts($scope);
-
- $scope.updateSubmenuVisibility();
- $scope.setWindowTitleAndTheme();
-
- $scope.appEvent("dashboard-loaded", $scope.dashboard);
- }).catch(function(err) {
- if (err.data && err.data.message) { err.message = err.data.message; }
- $scope.appEvent("alert-error", ['Dashboard init failed', 'Template variables could not be initialized: ' + err.message]);
- });
- };
-
- $scope.updateSubmenuVisibility = function() {
- $scope.submenuEnabled = $scope.dashboard.isSubmenuFeaturesEnabled();
- };
-
- $scope.setWindowTitleAndTheme = function() {
- window.document.title = config.window_title_prefix + $scope.dashboard.title;
- };
-
- $scope.broadcastRefresh = function() {
- $rootScope.performance.panelsRendered = 0;
- $rootScope.$broadcast('refresh');
- };
-
- $scope.addRow = function(dash, row) {
- dash.rows.push(row);
- };
-
- $scope.addRowDefault = function() {
- $scope.resetRow();
- $scope.row.title = 'New row';
- $scope.addRow($scope.dashboard, $scope.row);
- };
-
- $scope.resetRow = function() {
- $scope.row = {
- title: '',
- height: '250px',
- editable: true,
- };
- };
-
- $scope.showJsonEditor = function(evt, options) {
- var editScope = $rootScope.$new();
- editScope.object = options.object;
- editScope.updateHandler = options.updateHandler;
- $scope.appEvent('show-dash-editor', { src: 'public/app/partials/edit_json.html', scope: editScope });
- };
-
- $scope.onDrop = function(panelId, row, dropTarget) {
- var info = $scope.dashboard.getPanelInfoById(panelId);
- if (dropTarget) {
- var dropInfo = $scope.dashboard.getPanelInfoById(dropTarget.id);
- dropInfo.row.panels[dropInfo.index] = info.panel;
- info.row.panels[info.index] = dropTarget;
- var dragSpan = info.panel.span;
- info.panel.span = dropTarget.span;
- dropTarget.span = dragSpan;
- }
- else {
- info.row.panels.splice(info.index, 1);
- info.panel.span = 12 - $scope.dashboard.rowSpan(row);
- row.panels.push(info.panel);
- }
-
- $rootScope.$broadcast('render');
- };
-
- $scope.registerWindowResizeEvent = function() {
- angular.element(window).bind('resize', function() {
- $timeout.cancel(resizeEventTimeout);
- resizeEventTimeout = $timeout(function() { $scope.$broadcast('render'); }, 200);
- });
- $scope.$on('$destroy', function() {
- angular.element(window).unbind('resize');
- });
- };
-
- $scope.formatDate = function(date) {
- return moment(date).format('MMM Do YYYY, h:mm:ss a');
- };
-
- });
-
-});
diff --git a/public/app/features/dashboard/dashboardLoaderSrv.js b/public/app/features/dashboard/dashboardLoaderSrv.js
index 1af0894b462..c6df45f53b2 100644
--- a/public/app/features/dashboard/dashboardLoaderSrv.js
+++ b/public/app/features/dashboard/dashboardLoaderSrv.js
@@ -47,6 +47,7 @@ function (angular, moment, _, $, kbn, dateMath, impressionStore) {
}
promise.then(function(result) {
+
if (result.meta.dashboardNotFound !== true) {
impressionStore.impressions.addDashboardImpression(result.dashboard.id);
}
diff --git a/public/app/features/dashboard/dashboardSrv.js b/public/app/features/dashboard/dashboardSrv.js
deleted file mode 100644
index b3194868d97..00000000000
--- a/public/app/features/dashboard/dashboardSrv.js
+++ /dev/null
@@ -1,488 +0,0 @@
-define([
- 'angular',
- 'jquery',
- 'lodash',
- 'moment',
-],
-function (angular, $, _, moment) {
- 'use strict';
-
- var module = angular.module('grafana.services');
-
- module.factory('dashboardSrv', function() {
-
- function DashboardModel (data, meta) {
- if (!data) {
- data = {};
- }
-
- if (!data.id && data.version) {
- data.schemaVersion = data.version;
- }
-
- this.id = data.id || null;
- this.title = data.title || 'No Title';
- this.originalTitle = this.title;
- this.tags = data.tags || [];
- this.style = data.style || "dark";
- this.timezone = data.timezone || 'browser';
- this.editable = data.editable !== false;
- this.hideControls = data.hideControls || false;
- this.sharedCrosshair = data.sharedCrosshair || false;
- this.rows = data.rows || [];
- this.time = data.time || { from: 'now-6h', to: 'now' };
- this.timepicker = data.timepicker || {};
- this.templating = this._ensureListExist(data.templating);
- this.annotations = this._ensureListExist(data.annotations);
- this.refresh = data.refresh;
- this.snapshot = data.snapshot;
- this.schemaVersion = data.schemaVersion || 0;
- this.version = data.version || 0;
- this.links = data.links || [];
- this._updateSchema(data);
- this._initMeta(meta);
- }
-
- var p = DashboardModel.prototype;
-
- p._initMeta = function(meta) {
- meta = meta || {};
-
- meta.canShare = meta.canShare !== false;
- meta.canSave = meta.canSave !== false;
- meta.canStar = meta.canStar !== false;
- meta.canEdit = meta.canEdit !== false;
-
- if (!this.editable) {
- meta.canEdit = false;
- meta.canDelete = false;
- meta.canSave = false;
- this.hideControls = true;
- }
-
- this.meta = meta;
- };
-
- // cleans meta data and other non peristent state
- p.getSaveModelClone = function() {
- var copy = angular.copy(this);
- delete copy.meta;
- return copy;
- };
-
- p._ensureListExist = function (data) {
- if (!data) { data = {}; }
- if (!data.list) { data.list = []; }
- return data;
- };
-
- p.getNextPanelId = function() {
- var i, j, row, panel, max = 0;
- for (i = 0; i < this.rows.length; i++) {
- row = this.rows[i];
- for (j = 0; j < row.panels.length; j++) {
- panel = row.panels[j];
- if (panel.id > max) { max = panel.id; }
- }
- }
- return max + 1;
- };
-
- p.forEachPanel = function(callback) {
- var i, j, row;
- for (i = 0; i < this.rows.length; i++) {
- row = this.rows[i];
- for (j = 0; j < row.panels.length; j++) {
- callback(row.panels[j], j, row, i);
- }
- }
- };
-
- p.getPanelById = function(id) {
- for (var i = 0; i < this.rows.length; i++) {
- var row = this.rows[i];
- for (var j = 0; j < row.panels.length; j++) {
- var panel = row.panels[j];
- if (panel.id === id) {
- return panel;
- }
- }
- }
- return null;
- };
-
- p.rowSpan = function(row) {
- return _.reduce(row.panels, function(p,v) {
- return p + v.span;
- },0);
- };
-
- p.addPanel = function(panel, row) {
- var rowSpan = this.rowSpan(row);
- var panelCount = row.panels.length;
- var space = (12 - rowSpan) - panel.span;
- panel.id = this.getNextPanelId();
-
- // try to make room of there is no space left
- if (space <= 0) {
- if (panelCount === 1) {
- row.panels[0].span = 6;
- panel.span = 6;
- }
- else if (panelCount === 2) {
- row.panels[0].span = 4;
- row.panels[1].span = 4;
- panel.span = 4;
- }
- }
-
- row.panels.push(panel);
- };
-
- p.isSubmenuFeaturesEnabled = function() {
- var visableTemplates = _.filter(this.templating.list, function(template) {
- return template.hideVariable === undefined || template.hideVariable === false;
- });
-
- return visableTemplates.length > 0 || this.annotations.list.length > 0 || this.links.length > 0;
- };
-
- p.getPanelInfoById = function(panelId) {
- var result = {};
- _.each(this.rows, function(row) {
- _.each(row.panels, function(panel, index) {
- if (panel.id === panelId) {
- result.panel = panel;
- result.row = row;
- result.index = index;
- }
- });
- });
-
- if (!result.panel) {
- return null;
- }
-
- return result;
- };
-
- p.duplicatePanel = function(panel, row) {
- var rowIndex = _.indexOf(this.rows, row);
- var newPanel = angular.copy(panel);
- newPanel.id = this.getNextPanelId();
-
- delete newPanel.repeat;
- delete newPanel.repeatIteration;
- delete newPanel.repeatPanelId;
- delete newPanel.scopedVars;
-
- var currentRow = this.rows[rowIndex];
- currentRow.panels.push(newPanel);
- return newPanel;
- };
-
- p.formatDate = function(date, format) {
- date = moment.isMoment(date) ? date : moment(date);
- format = format || 'YYYY-MM-DD HH:mm:ss';
-
- return this.timezone === 'browser' ?
- moment(date).format(format) :
- moment.utc(date).format(format);
- };
-
- p.getRelativeTime = function(date) {
- date = moment.isMoment(date) ? date : moment(date);
-
- return this.timezone === 'browser' ?
- moment(date).fromNow() :
- moment.utc(date).fromNow();
- };
-
- p.getNextQueryLetter = function(panel) {
- var letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-
- return _.find(letters, function(refId) {
- return _.every(panel.targets, function(other) {
- return other.refId !== refId;
- });
- });
- };
-
- p._updateSchema = function(old) {
- var i, j, k;
- var oldVersion = this.schemaVersion;
- var panelUpgrades = [];
- this.schemaVersion = 12;
-
- if (oldVersion === this.schemaVersion) {
- return;
- }
-
- // version 2 schema changes
- if (oldVersion < 2) {
-
- if (old.services) {
- if (old.services.filter) {
- this.time = old.services.filter.time;
- this.templating.list = old.services.filter.list || [];
- }
- delete this.services;
- }
-
- panelUpgrades.push(function(panel) {
- // rename panel type
- if (panel.type === 'graphite') {
- panel.type = 'graph';
- }
-
- if (panel.type !== 'graph') {
- return;
- }
-
- if (_.isBoolean(panel.legend)) { panel.legend = { show: panel.legend }; }
-
- if (panel.grid) {
- if (panel.grid.min) {
- panel.grid.leftMin = panel.grid.min;
- delete panel.grid.min;
- }
-
- if (panel.grid.max) {
- panel.grid.leftMax = panel.grid.max;
- delete panel.grid.max;
- }
- }
-
- if (panel.y_format) {
- panel.y_formats[0] = panel.y_format;
- delete panel.y_format;
- }
-
- if (panel.y2_format) {
- panel.y_formats[1] = panel.y2_format;
- delete panel.y2_format;
- }
- });
- }
-
- // schema version 3 changes
- if (oldVersion < 3) {
- // ensure panel ids
- var maxId = this.getNextPanelId();
- panelUpgrades.push(function(panel) {
- if (!panel.id) {
- panel.id = maxId;
- maxId += 1;
- }
- });
- }
-
- // schema version 4 changes
- if (oldVersion < 4) {
- // move aliasYAxis changes
- panelUpgrades.push(function(panel) {
- if (panel.type !== 'graph') { return; }
- _.each(panel.aliasYAxis, function(value, key) {
- panel.seriesOverrides = [{ alias: key, yaxis: value }];
- });
- delete panel.aliasYAxis;
- });
- }
-
- if (oldVersion < 6) {
- // move pulldowns to new schema
- var annotations = _.findWhere(old.pulldowns, { type: 'annotations' });
-
- if (annotations) {
- this.annotations = {
- list: annotations.annotations || [],
- };
- }
-
- // update template variables
- for (i = 0 ; i < this.templating.list.length; i++) {
- var variable = this.templating.list[i];
- if (variable.datasource === void 0) { variable.datasource = null; }
- if (variable.type === 'filter') { variable.type = 'query'; }
- if (variable.type === void 0) { variable.type = 'query'; }
- if (variable.allFormat === void 0) { variable.allFormat = 'glob'; }
- }
- }
-
- if (oldVersion < 7) {
- if (old.nav && old.nav.length) {
- this.timepicker = old.nav[0];
- delete this.nav;
- }
-
- // ensure query refIds
- panelUpgrades.push(function(panel) {
- _.each(panel.targets, function(target) {
- if (!target.refId) {
- target.refId = this.getNextQueryLetter(panel);
- }
- }, this);
- });
- }
-
- if (oldVersion < 8) {
- panelUpgrades.push(function(panel) {
- _.each(panel.targets, function(target) {
- // update old influxdb query schema
- if (target.fields && target.tags && target.groupBy) {
- if (target.rawQuery) {
- delete target.fields;
- delete target.fill;
- } else {
- target.select = _.map(target.fields, function(field) {
- var parts = [];
- parts.push({type: 'field', params: [field.name]});
- parts.push({type: field.func, params: []});
- if (field.mathExpr) {
- parts.push({type: 'math', params: [field.mathExpr]});
- }
- if (field.asExpr) {
- parts.push({type: 'alias', params: [field.asExpr]});
- }
- return parts;
- });
- delete target.fields;
- _.each(target.groupBy, function(part) {
- if (part.type === 'time' && part.interval) {
- part.params = [part.interval];
- delete part.interval;
- }
- if (part.type === 'tag' && part.key) {
- part.params = [part.key];
- delete part.key;
- }
- });
-
- if (target.fill) {
- target.groupBy.push({type: 'fill', params: [target.fill]});
- delete target.fill;
- }
- }
- }
- });
- });
- }
-
- // schema version 9 changes
- if (oldVersion < 9) {
- // move aliasYAxis changes
- panelUpgrades.push(function(panel) {
- if (panel.type !== 'singlestat' && panel.thresholds !== "") { return; }
-
- if (panel.thresholds) {
- var k = panel.thresholds.split(",");
-
- if (k.length >= 3) {
- k.shift();
- panel.thresholds = k.join(",");
- }
- }
- });
- }
-
- // schema version 10 changes
- if (oldVersion < 10) {
- // move aliasYAxis changes
- panelUpgrades.push(function(panel) {
- if (panel.type !== 'table') { return; }
-
- _.each(panel.styles, function(style) {
- if (style.thresholds && style.thresholds.length >= 3) {
- var k = style.thresholds;
- k.shift();
- style.thresholds = k;
- }
- });
- });
- }
-
- if (oldVersion < 12) {
- // update template variables
- _.each(this.templating.list, function(templateVariable) {
- if (templateVariable.refresh) { templateVariable.refresh = 1; }
- if (!templateVariable.refresh) { templateVariable.refresh = 0; }
- if (templateVariable.hideVariable) {
- templateVariable.hide = 2;
- } else if (templateVariable.hideLabel) {
- templateVariable.hide = 1;
- } else {
- templateVariable.hide = 0;
- }
- });
- }
-
- if (oldVersion < 12) {
- // update graph yaxes changes
- panelUpgrades.push(function(panel) {
- if (panel.type !== 'graph') { return; }
- if (!panel.yaxes) {
- panel.yaxes = [
- {
- show: panel['y-axis'],
- min: panel.grid.leftMin,
- max: panel.grid.leftMax,
- logBase: panel.grid.leftLogBase,
- format: panel.y_formats[0],
- label: panel.leftYAxisLabel,
- },
- {
- show: panel['y-axis'],
- min: panel.grid.rightMin,
- max: panel.grid.rightMax,
- logBase: panel.grid.rightLogBase,
- format: panel.y_formats[1],
- label: panel.rightYAxisLabel,
- }
- ];
-
- panel.xaxis = {
- show: panel['x-axis'],
- };
-
- delete panel.grid.leftMin;
- delete panel.grid.leftMax;
- delete panel.grid.leftLogBase;
- delete panel.grid.rightMin;
- delete panel.grid.rightMax;
- delete panel.grid.rightLogBase;
- delete panel.y_formats;
- delete panel.leftYAxisLabel;
- delete panel.rightYAxisLabel;
- delete panel['y-axis'];
- delete panel['x-axis'];
- }
- });
- }
-
- if (panelUpgrades.length === 0) {
- return;
- }
-
- for (i = 0; i < this.rows.length; i++) {
- var row = this.rows[i];
- for (j = 0; j < row.panels.length; j++) {
- for (k = 0; k < panelUpgrades.length; k++) {
- panelUpgrades[k].call(this, row.panels[j]);
- }
- }
- }
- };
-
- return {
- create: function(dashboard, meta) {
- return new DashboardModel(dashboard, meta);
- },
- setCurrent: function(dashboard) {
- this.currentDashboard = dashboard;
- },
- getCurrent: function() {
- return this.currentDashboard;
- },
- };
- });
-});
diff --git a/public/app/features/dashboard/dashboard_ctrl.ts b/public/app/features/dashboard/dashboard_ctrl.ts
new file mode 100644
index 00000000000..c07f84e820c
--- /dev/null
+++ b/public/app/features/dashboard/dashboard_ctrl.ts
@@ -0,0 +1,140 @@
+///
+
+import config from 'app/core/config';
+import angular from 'angular';
+import moment from 'moment';
+import _ from 'lodash';
+
+import coreModule from 'app/core/core_module';
+
+export class DashboardCtrl {
+
+ /** @ngInject */
+ constructor(
+ private $scope,
+ private $rootScope,
+ keybindingSrv,
+ timeSrv,
+ variableSrv,
+ alertingSrv,
+ dashboardSrv,
+ unsavedChangesSrv,
+ dynamicDashboardSrv,
+ dashboardViewStateSrv,
+ contextSrv,
+ alertSrv,
+ $timeout) {
+
+ $scope.editor = { index: 0 };
+
+ var resizeEventTimeout;
+
+ $scope.setupDashboard = function(data) {
+ try {
+ $scope.setupDashboardInternal(data);
+ } catch (err) {
+ $scope.onInitFailed(err, 'Dashboard init failed', true);
+ }
+ };
+
+ $scope.setupDashboardInternal = function(data) {
+ var dashboard = dashboardSrv.create(data.dashboard, data.meta);
+ dashboardSrv.setCurrent(dashboard);
+
+ // init services
+ timeSrv.init(dashboard);
+ alertingSrv.init(dashboard, data.alerts);
+
+ // template values service needs to initialize completely before
+ // the rest of the dashboard can load
+ variableSrv.init(dashboard)
+ // template values failes are non fatal
+ .catch($scope.onInitFailed.bind(this, 'Templating init failed', false))
+ // continue
+ .finally(function() {
+ dynamicDashboardSrv.init(dashboard);
+ dynamicDashboardSrv.process();
+
+ unsavedChangesSrv.init(dashboard, $scope);
+
+ $scope.dashboard = dashboard;
+ $scope.dashboardMeta = dashboard.meta;
+ $scope.dashboardViewState = dashboardViewStateSrv.create($scope);
+
+ keybindingSrv.setupDashboardBindings($scope, dashboard);
+
+ $scope.dashboard.updateSubmenuVisibility();
+ $scope.setWindowTitleAndTheme();
+
+ $scope.appEvent("dashboard-initialized", $scope.dashboard);
+ })
+ .catch($scope.onInitFailed.bind(this, 'Dashboard init failed', true));
+ };
+
+ $scope.onInitFailed = function(msg, fatal, err) {
+ console.log(msg, err);
+
+ if (err.data && err.data.message) {
+ err.message = err.data.message;
+ } else if (!err.message) {
+ err = {message: err.toString()};
+ }
+
+ $scope.appEvent("alert-error", [msg, err.message]);
+
+ // protect against recursive fallbacks
+ if (fatal && !$scope.loadedFallbackDashboard) {
+ $scope.loadedFallbackDashboard = true;
+ $scope.setupDashboard({dashboard: {title: 'Dashboard Init failed'}});
+ }
+ };
+
+ $scope.templateVariableUpdated = function() {
+ dynamicDashboardSrv.process();
+ };
+
+ $scope.setWindowTitleAndTheme = function() {
+ window.document.title = config.window_title_prefix + $scope.dashboard.title;
+ };
+
+ $scope.broadcastRefresh = function() {
+ $rootScope.$broadcast('refresh');
+ };
+
+ $scope.addRowDefault = function() {
+ $scope.dashboard.addEmptyRow();
+ };
+
+ $scope.showJsonEditor = function(evt, options) {
+ var editScope = $rootScope.$new();
+ editScope.object = options.object;
+ editScope.updateHandler = options.updateHandler;
+ $scope.appEvent('show-dash-editor', { src: 'public/app/partials/edit_json.html', scope: editScope });
+ };
+
+ $scope.registerWindowResizeEvent = function() {
+ angular.element(window).bind('resize', function() {
+ $timeout.cancel(resizeEventTimeout);
+ resizeEventTimeout = $timeout(function() { $scope.$broadcast('render'); }, 200);
+ });
+
+ $scope.$on('$destroy', function() {
+ angular.element(window).unbind('resize');
+ $scope.dashboard.destroy();
+ });
+ };
+
+ $scope.timezoneChanged = function() {
+ $rootScope.$broadcast("refresh");
+ };
+ }
+
+ init(dashboard) {
+ this.$scope.onAppEvent('show-json-editor', this.$scope.showJsonEditor);
+ this.$scope.onAppEvent('template-variable-value-updated', this.$scope.templateVariableUpdated);
+ this.$scope.setupDashboard(dashboard);
+ this.$scope.registerWindowResizeEvent();
+ }
+}
+
+coreModule.controller('DashboardCtrl', DashboardCtrl);
diff --git a/public/app/features/dashboard/dashboard_srv.ts b/public/app/features/dashboard/dashboard_srv.ts
new file mode 100644
index 00000000000..5939ff83a15
--- /dev/null
+++ b/public/app/features/dashboard/dashboard_srv.ts
@@ -0,0 +1,118 @@
+///
+
+import _ from 'lodash';
+import coreModule from 'app/core/core_module';
+import {DashboardModel} from './model';
+
+export class DashboardSrv {
+ dash: any;
+
+ /** @ngInject */
+ constructor(private backendSrv, private $rootScope, private $location) {
+ }
+
+ create(dashboard, meta) {
+ return new DashboardModel(dashboard, meta);
+ }
+
+ setCurrent(dashboard) {
+ this.dash = dashboard;
+ }
+
+ getCurrent() {
+ return this.dash;
+ }
+
+ saveDashboard(options) {
+ if (!this.dash.meta.canSave && options.makeEditable !== true) {
+ return Promise.resolve();
+ }
+
+ if (this.dash.title === 'New dashboard') {
+ return this.saveDashboardAs();
+ }
+
+ var clone = this.dash.getSaveModelClone();
+
+ return this.backendSrv.saveDashboard(clone, options).then(data => {
+ this.dash.version = data.version;
+
+ this.$rootScope.appEvent('dashboard-saved', this.dash);
+
+ var dashboardUrl = '/dashboard/db/' + data.slug;
+ if (dashboardUrl !== this.$location.path()) {
+ this.$location.url(dashboardUrl);
+ }
+
+ this.$rootScope.appEvent('alert-success', ['Dashboard saved', 'Saved as ' + clone.title]);
+ }).catch(this.handleSaveDashboardError.bind(this));
+ }
+
+ handleSaveDashboardError(err) {
+ if (err.data && err.data.status === "version-mismatch") {
+ err.isHandled = true;
+
+ this.$rootScope.appEvent('confirm-modal', {
+ title: 'Conflict',
+ text: 'Someone else has updated this dashboard.',
+ text2: 'Would you still like to save this dashboard?',
+ yesText: "Save & Overwrite",
+ icon: "fa-warning",
+ onConfirm: () => {
+ this.saveDashboard({overwrite: true});
+ }
+ });
+ }
+
+ if (err.data && err.data.status === "name-exists") {
+ err.isHandled = true;
+
+ this.$rootScope.appEvent('confirm-modal', {
+ title: 'Conflict',
+ text: 'Dashboard with the same name exists.',
+ text2: 'Would you still like to save this dashboard?',
+ yesText: "Save & Overwrite",
+ icon: "fa-warning",
+ onConfirm: () => {
+ this.saveDashboard({overwrite: true});
+ }
+ });
+ }
+
+ if (err.data && err.data.status === "plugin-dashboard") {
+ err.isHandled = true;
+
+ this.$rootScope.appEvent('confirm-modal', {
+ title: 'Plugin Dashboard',
+ text: err.data.message,
+ text2: 'Your changes will be lost when you update the plugin. Use Save As to create custom version.',
+ yesText: "Overwrite",
+ icon: "fa-warning",
+ altActionText: "Save As",
+ onAltAction: () => {
+ this.saveDashboardAs();
+ },
+ onConfirm: () => {
+ this.saveDashboard({overwrite: true});
+ }
+ });
+ }
+ }
+
+ saveDashboardAs() {
+ var newScope = this.$rootScope.$new();
+ newScope.clone = this.dash.getSaveModelClone();
+ newScope.clone.editable = true;
+ newScope.clone.hideControls = false;
+
+ this.$rootScope.appEvent('show-modal', {
+ src: 'public/app/features/dashboard/partials/saveDashboardAs.html',
+ scope: newScope,
+ modalClass: 'modal--narrow'
+ });
+ }
+
+}
+
+coreModule.service('dashboardSrv', DashboardSrv);
+
diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html
index 19112f77a43..7cb22c756cd 100644
--- a/public/app/features/dashboard/dashnav/dashnav.html
+++ b/public/app/features/dashboard/dashnav/dashnav.html
@@ -14,6 +14,18 @@
+
+
-
+
+
Settings Annotations Templating
-
Export
-
View JSON
+
View JSON Make Editable Save As...
+
Delete dashboard
-
-
diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts
index 2d5b66cb13c..33bb4411640 100644
--- a/public/app/features/dashboard/dashnav/dashnav.ts
+++ b/public/app/features/dashboard/dashnav/dashnav.ts
@@ -4,15 +4,16 @@ import _ from 'lodash';
import moment from 'moment';
import angular from 'angular';
+import {DashboardExporter} from '../export/exporter';
+
export class DashNavCtrl {
/** @ngInject */
- constructor($scope, $rootScope, alertSrv, $location, playlistSrv, backendSrv, $timeout) {
+ constructor($scope, $rootScope, dashboardSrv, $location, playlistSrv, backendSrv, $timeout, datasourceSrv) {
$scope.init = function() {
$scope.onAppEvent('save-dashboard', $scope.saveDashboard);
$scope.onAppEvent('delete-dashboard', $scope.deleteDashboard);
- $scope.onAppEvent('export-dashboard', $scope.snapshot);
$scope.onAppEvent('quick-snapshot', $scope.quickSnapshot);
$scope.showSettingsMenu = $scope.dashboardMeta.canEdit || $scope.contextSrv.isEditor;
@@ -32,6 +33,10 @@ export class DashNavCtrl {
$location.search(search);
};
+ $scope.showHelpModal = function() {
+ $scope.appEvent('show-modal', {templateHtml: '
+
+
+
+
+
+
+
+
+
Grafana.net Dashboard
+
+
+
+
Or paste JSON
+
+
+
+
+
+
+
+
+ Options
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/app/features/dashboard/partials/globalAlerts.html b/public/app/features/dashboard/partials/globalAlerts.html
deleted file mode 100644
index 2c065c714fb..00000000000
--- a/public/app/features/dashboard/partials/globalAlerts.html
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-
-
-
-
-
Global alerts
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Migrate dashboards
-
-
-
-
-
{{infoText}}
-
-
-
-
- {{dash.name}}
-
- {{dash.info}}
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
-
+
Message:
@@ -68,9 +71,9 @@
Stack trace:
-
- {{stack_trace}}
-
+
+{{stack_trace}}
+
diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html
index 33b1a247235..b8d8303a51b 100644
--- a/public/app/features/dashboard/partials/settings.html
+++ b/public/app/features/dashboard/partials/settings.html
@@ -22,11 +22,18 @@
-
-
-
Rows settings
-
-
-
diff --git a/public/app/features/dashboard/partials/shareModal.html b/public/app/features/dashboard/partials/shareModal.html
index 41c08fede0b..bab75a7f523 100644
--- a/public/app/features/dashboard/partials/shareModal.html
+++ b/public/app/features/dashboard/partials/shareModal.html
@@ -25,44 +25,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Drag and drop between the two lists.
+
+
+
+
Beasts
+
+
Left column of beasts is not draggable and accepts both beasts and priests
+
+
+
+
+
+
+
+
Priests
+
+
+
+
+
+
+
+
Terrorists
+
+
Each terrorist list item accepts a new terrorist. Shows inserting into a particular
+ position in an array.
+
+
+
+
+
+
+
+
+
Custom Drag Image
+
+
You may specify a drag-image-element-id to use as the drag image. You can use the
+ ghost image
+ technique for the custom drag image.
+
+
+
+
+
+
+
Custom drag image #1
+
Custom drag image #2
+
+
+
+
+
+
The image above shows you the top header for a Dashboard.
@@ -29,12 +34,12 @@ The image above shows you the top header for a Dashboard.
6. Settings: Manage Dashboard settings and features such as Templating and Annotations.
## Dashboards, Panels, Rows, the building blocks of Grafana...
-Dashboards are at the core of what Grafana is all about. Dashboards are composed of individual Panels arranged on a number of Rows. Grafana ships with a variety of Panels. Grafana makes it easy to construct the right queries, and customize the display properties so that you can create the perfect Dashboard for your need. Each Panel can interact with data from any configured Grafana Data Source (currently InfluxDB, Graphite, OpenTSDB, and KairosDB). The [Core Concepts](/guides/basic_concepts) guide explores these key ideas in detail.
+Dashboards are at the core of what Grafana is all about. Dashboards are composed of individual Panels arranged on a number of Rows. Grafana ships with a variety of Panels. Grafana makes it easy to construct the right queries, and customize the display properties so that you can create the perfect Dashboard for your need. Each Panel can interact with data from any configured Grafana Data Source (currently InfluxDB, Graphite, OpenTSDB, and KairosDB). The [Basic Concepts](/guides/basic_concepts) guide explores these key ideas in detail.
## Adding & Editing Graphs and Panels
-
+
1. You add panels via row menu. The row menu is the green icon to the left of each row.
2. To edit the graph you click on the graph title to open the panel menu, then `Edit`.
@@ -43,8 +48,7 @@ Dashboards are at the core of what Grafana is all about. Dashboards are composed
When you click the `Metrics` tab, you are presented with a Query Editor that is specific to the Panel Data Source. Use the Query Editor to build your queries and Grafana will visualize them in real time.
-
-
+
1. Zoom out time range
2. Time picker dropdown. Here you can access relative time range options, auto refresh options and set custom absolute time ranges.
@@ -57,7 +61,7 @@ When you click the `Metrics` tab, you are presented with a Query Editor that is
You can Drag-and-Drop Panels within and between Rows. Click and hold the Panel title, and drag it to its new location. You can also easily resize panels by clicking the (-) and (+) icons.
-
+
## Tips and shortcuts
@@ -75,15 +79,3 @@ You can Drag-and-Drop Panels within and between Rows. Click and hold the Panel t
* Ctrl+H Hides all controls (good for tv displays)
* Hit Escape to exit graph when in fullscreen or edit mode
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/sources/guides/index.md b/docs/sources/guides/index.md
new file mode 100644
index 00000000000..c80dd624624
--- /dev/null
+++ b/docs/sources/guides/index.md
@@ -0,0 +1,9 @@
++++
+title = "Guides"
+type = "docs"
+[menu.docs]
+name = "Getting Started"
+identifier = "guides"
+weight = 2
++++
+
diff --git a/docs/sources/guides/screencasts.md b/docs/sources/guides/screencasts.md
deleted file mode 100644
index 500ca9f9b6a..00000000000
--- a/docs/sources/guides/screencasts.md
+++ /dev/null
@@ -1,69 +0,0 @@
-page_title: Screencasts
-page_description: Grafana screencasts
-page_keywords: grafana, screencasts, documentation, guides
-no_toc: true
-
-# Screencasts
-
-
+
A new timepicker with room for more quick ranges as well as new types of relative ranges, like `Today`,
`The day so far` and `This day last week`. Also an improved time & calendar picker that now works
@@ -20,7 +26,7 @@ correctly in UTC mode.
### Elasticsearch
-
+
+
Grafana 2.5 ships with a new CloudWatch datasource that will allow you to query and visualize CloudWatch
metrics directly from Grafana.
@@ -51,14 +57,14 @@ metrics directly from Grafana.
### Prometheus
-
+
Grafana 2.5 ships with a new Prometheus datasource that will allow you to query and visualize data
stored in Prometheus.
### Mix different data sources
-
+
In previous releases you have been able to mix different data sources on the same dashboard. In v2.5 you
will be able to mix then on the same graph! You can enable this by selecting the built in `-- Mixed --` data source.
@@ -67,12 +73,12 @@ to plot metrics from different Graphite servers on the same Graph or plot data f
data from Prometheus. Mixing different data sources on the same graph works for any data source, even custom ones.
### Panel Resize handles
-
+
This release adds resize handles to the the bottom right corners of panels making is easy to resize both width and height.
### User invites
-
+
This version also brings some new features for user management.
diff --git a/docs/sources/guides/whats-new-in-v2-6.md b/docs/sources/guides/whats-new-in-v2-6.md
index ac644ad44af..0b1e6688e60 100644
--- a/docs/sources/guides/whats-new-in-v2-6.md
+++ b/docs/sources/guides/whats-new-in-v2-6.md
@@ -1,8 +1,14 @@
----
-page_title: What's New in Grafana v2.6
-page_description: What's new in Grafana v2.6
-page_keywords: grafana, new, changes, features, documentation, table
----
++++
+title = "What's New in Grafana v2.6"
+description = "Feature & improvement highlights for Grafana v2.6"
+keywords = ["grafana", "new", "documentation", "2.6"]
+type = "docs"
+[menu.docs]
+name = "Version 2.6"
+identifier = "v2.6"
+parent = "whatsnew"
+weight = 7
++++
# What's new in Grafana v2.6
@@ -11,7 +17,7 @@ The release includes a new Table panel, a new InfluxDB query editor, support for
support for multiple Cloudwatch credentials.
## Table Panel
-
+
The new table panel is very flexible, supporting both multiple modes for time series as well as for
table, annotation and raw JSON data. It also provides date formating and value formating and coloring options.
@@ -21,7 +27,7 @@ table, annotation and raw JSON data. It also provides date formating and value f
In the most simple mode you can turn time series to rows. This means you get a `Time`, `Metric` and a `Value` column.
Where `Metric` is the name of the time series.
-
+
### Table Transform
Above you see the options tab for the **Table Panel**. The most important option is the `To Table Transform`.
@@ -34,7 +40,7 @@ The column styles allow you control how dates and numbers are formatted.
This transform allows you to take multiple time series and group them by time. Which will result in a `Time` column
and a column for each time series.
-
+
In the screenshot above you can see how the same time series query as in the previous example can be transformed into
a different table by changing the `To Table Transform` to `Time series to columns`.
@@ -43,7 +49,7 @@ a different table by changing the `To Table Transform` to `Time series to colum
This transform works very similar to the legend values in the Graph panel. Each series gets its own row. In the Options
tab you can select which aggregations you want using the plus button the Columns section.
-
+
You have to think about how accurate the aggregations will be. It depends on what aggregation is used in the time series query,
how many data points are fetched, etc. The time series aggregations are calculated by Grafana after aggregation is performed
@@ -53,38 +59,39 @@ by the time series database.
If you want to show documents from Elasticsearch pick `Raw Document` as the first metric.
-
+
This in combination with the `JSON Data` table transform will allow you to pick which fields in the document
you want to show in the table.
-
+
### Elasticsearch aggregations
You can also make Elasticsearch aggregation queries without a `Date Histogram`. This allows you to
use Elasticsearch metric aggregations to get accurate aggregations for the selected time range.
-
+
### Annotations
The table can also show any annotations you have enabled in the dashboard.
-
+
## The New InfluxDB Editor
The new InfluxDB editor is a lot more flexible and powerful. It supports nested functions, like `derivative`.
It also uses the same technique as the Graphite query editor in that it presents nested functions as chain of function
transformations. It tries to simplify and unify the complicated nature of InfluxDB's query language.
-
+
In the `SELECT` row you can specify what fields and functions you want to use. If you have a
group by time you need an aggregation function. Some functions like derivative require an aggregation function.
The editor tries simplify and unify this part of the query. For example:
-
+
+
The above will generate the following InfluxDB `SELECT` clause:
@@ -103,7 +110,7 @@ You can remove the group by by clicking on the `tag` and then click on the x ico
The new editor also allows you to remove group by time and select `raw` table data. Which is very useful
in combination with the new Table panel to show raw log data stored in InfluxDB.
-
+
## Pipeline metrics
@@ -111,7 +118,7 @@ If you have Elasticsearch 2.x and Grafana 2.6 or above then you can use pipeline
**Moving Average** and **Derivative**. Elasticsearch pipeline metrics require another metric to be based on. Use the eye icon next to the metric
to hide metrics from appearing in the graph.
-
+
## Changelog
For a detailed list and link to github issues for everything included in the 2.6 release please
diff --git a/docs/sources/guides/whats-new-in-v2.md b/docs/sources/guides/whats-new-in-v2.md
index 9e87ab55e6e..bd92128a12e 100644
--- a/docs/sources/guides/whats-new-in-v2.md
+++ b/docs/sources/guides/whats-new-in-v2.md
@@ -1,8 +1,14 @@
----
-page_title: What's New in Grafana v2.0
-page_description: What's new in Grafana v2.0
-page_keywords: grafana, new, changes, features, documentation
----
++++
+title = "What's New in Grafana v2.0"
+description = "Feature & improvement highlights for Grafana v2.0"
+keywords = ["grafana", "new", "documentation", "2.0"]
+type = "docs"
+[menu.docs]
+name = "Version 2.0"
+identifier = "v2.0"
+parent = "whatsnew"
+weight = 11
++++
# What's New in Grafana v2.0
@@ -49,7 +55,7 @@ even zoom in). Also they are fast to load as they aren't actually connected to a
They're a great way to communicate about a particular incident with specific people who aren't Users of your Grafana instance. You can also use them to show off your dashboards over the Internet.
-
+
### Publish snapshots
@@ -61,11 +67,11 @@ Either way, anyone with the link (and access to your Grafana instance for local
In Grafana v2.x you can now override the relative time range for individual panels, causing them to be different than what is selected in the Dashboard time picker in the upper right. You can also add a time shift to individual panels. This allows you to show metrics from different time periods or days at the same time.
-
+
You control these overrides in panel editor mode and the new tab `Time Range`.
-
+
When you zoom or change the Dashboard time to a custom absolute time range, all panel overrides will be disabled. The panel relative time override is only active when the dashboard time is also relative. The panel timeshift override however is always active, even when the dashboard time is absolute.
@@ -90,7 +96,7 @@ This feature makes it easy to include interactive visualizations from your Grafa
The top header has gotten a major streamlining in Grafana V2.0.
-
+
+Dashboards exported from Grafana 3.1 are now more portable and easier for others to import than before.
+The export process extracts information data source types used by panels and adds these to a new `inputs`
+section in the dashboard json. So when you or another person tries to import the dashboard they will be asked to
+select data source and optional metrix prefix options.
+
+
+
+The above screenshot shows the new import modal that gives you 3 options for how to import a dashboard.
+One notable new addition here is the ability to import directly from Dashboards shared on [Grafana.net](https://grafana.net).
+
+The next step in the import process:
+
+
+
+Here you can change the name of the dashboard and also pick what data sources you want the dashboard to use. The above screenshot
+shows a CollectD dashboard for Graphite that requires a metric prefix be specified.
+
+## Discover Dashboards
+
+On [Grafana.net](https://grafana.net) you can now browse & search for dashboards. We have already added a few but
+more are being uploaded every day. To import a dashboard just copy the dashboard url and head back to Grafana,
+then Dashboard Search -> Import -> Paste Grafana.net Dashboard URL.
+
+
+
+## Constant template variables
+
+We added a new template variable named constant that makes it easier to share and export dashboard that have custom prefixes.
+
+## Dashboard Urls
+Having current time range and template variable value always sync with the URL makes it possible to always copy your current
+Grafana url to share with a colleague without having to use the Share modal.
+
+## Internal metrics
+
+Do you want metrics about viewing metrics? Ofc you do! In this release we added support for sending metrics about Grafana to graphite.
+You can configure interval and server in the config file.
+
+## Logging
+
+Switched logging framework to log15 to enable key value per logging and filtering based on different log levels.
+Its now possible to configure different log levels for different modules.
+
+### Breaking changes
+- **Logging** format have been changed to improve log filtering.
+- **Graphite PNG** Graphite PNG support dropped from Graph panel (use Grafana native PNG instead).
+- **Migration** No longer possible to migrate dashboards from 1.x (Stored in ES or Influx 0.8).
+
+## CHANGELOG
+
+For a detailed list and link to github issues for everything included
+in the 3.1 release please view the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
+file.
diff --git a/docs/sources/guides/whats-new-in-v3.md b/docs/sources/guides/whats-new-in-v3.md
new file mode 100644
index 00000000000..32912754fe9
--- /dev/null
+++ b/docs/sources/guides/whats-new-in-v3.md
@@ -0,0 +1,229 @@
++++
+title = "What's New in Grafana v3.0"
+description = "Feature & improvement highlights for Grafana v3.0"
+keywords = ["grafana", "new", "documentation", "3.0"]
+type = "docs"
+[menu.docs]
+name = "Version 3.0"
+identifier = "v3.0"
+parent = "whatsnew"
+weight = 2
++++
+
+# What's New in Grafana v3.0
+
+## Commercial Support
+
+Commercial Support subscriptions for Grafana are now [generally available](https://grafana.net/support/plans/).
+
+Raintank is committed to a 100% open-source strategy for Grafana. We
+do not want to go down the “open core” route. If your organization
+finds Grafana valuable, please consider purchasing a subscription. Get
+direct support, bug fixes, and training from the core Grafana team.
+
+## Plugins
+
+With the popularity of Grafana continuing to accelerate, it has been
+challenging to keep up with all the requests for new features, new
+panels, new data sources, and new functionality. Saying “no” so often
+has been frustrating, especially for an open source project with such
+a vibrant community.
+
+The team felt that it was time to dramatically improve extensibility
+through plugin support. Grafana 3.0 comes with a completely revamped
+plugin SDK / API.
+
+We’ve refactored our **Data Source** plugin architecture and added
+two new plugin types:
+
+* **Panel** plugins let you add new panel types for your Dashboards.
+* **App** plugins bundle **Panels** plugins, **Data Sources** plugins,
+Dashboards, and Grafana **Pages**. Apps are a great way to provide an
+entire experience right within Grafana.
+
+## Grafana.net
+
+
+
+[Grafana.net](https://grafana.net) offers a central repository where the community can come together to discover, create and
+share plugins (data sources, panels, apps) and dashboards.
+
+We are also working on a hosted Graphite-compatible data source that will be optimized for use with Grafana.
+It’ll be easy to combine your existing data source(s) with this OpenSaaS option. Finally, Grafana.net can
+also be a hub to manage all your Grafana instances. You’ll be able to monitor their health and availability,
+perform dashboard backups, and more.
+
+We are also working on a hosted Graphite-compatible Data Source that
+will be optimized for use with Grafana. It’ll be easy to combine your
+existing Data Source(s) with this OpenSaaS option.
+
+Finally, Grafana.net will also be a hub to manage all your Grafana
+instances. You’ll be able to monitor their health and availability,
+perform Dashboard backups, and more.
+
+Grafana.net will officially launch along with the stable version of
+Grafana 3.0, but check out the preview
+and sign up for an account in the meantime.
+
+
+## grafana-cli
+
+Grafana 3.0 comes with a new command line tool called grafana-cli. You
+can easily install plugins from Grafana.net with it. For
+example:
+
+```
+grafana-cli install grafana-pie-chart-panel
+```
+
+## Personalization & Preferences
+
+The home dashboard, timezone and theme can now be customized on Organization
+and user Profile level. Grafana can also track recently viewed dashboards, which
+can then be displayed in the dashboard list panel.
+
+## Improved Playlists
+
+You can now save Playlists, and start them by using a Playlist URL. If
+you update a running Playlist, it will update after its next cycle.
+
+This is powerful as it allows you to remote control Grafana. If you
+have a big TV display showing Grafana in your company lobby, create a
+playlist named Lobby, and start it on the computer connected to the
+Lobby TV.
+
+You can now change the Lobby playlist and have the dashboards shown in
+the Lobby update accordingly, automatically.
+
+The playlist does not even have to contain multiple Dashboards; you
+can use this feature to reload the whole Dashboard (and Grafana)
+periodically and remotely.
+
+You can also make Playlists dynamic by using Dashboard **tags** to
+define the Playlist.
+
+
+
+## Improved UI
+
+We’ve always tried to focus on a good looking, usable, and responsive
+UI. We’ve continued to pay a lot of attention to these areas in this
+release.
+
+Grafana 3.0 has a dramatically updated UI that not only looks better
+but also has a number of usability improvements. The side menu now
+works as a dropdown that you can pin to the side. The Organization /
+Profile / Sign out side menu links have been combined into an on hover
+slide out menu.
+
+In addition, all the forms and the layouts of all pages have been
+updated to look and flow better, and be much more consistent. There
+are literally hundreds of UI improvements and refinements.
+
+Here’s the new side menu in action:
+
+
+
+And here's the new look for Dashboard settings:
+
+
+
+Check out the Play
+Site to get a feel for some of the UI changes.
+
+## Improved Annotations
+
+It is now possible to define a link in each annotation. You can hover
+over the link and click the annotation text. This feature is very
+useful for linking to particular commits or tickets where more
+detailed information can be presented to the user.
+
+
+
+## Data source variables
+
+This has been a top requested feature for very long we are exited to finally provide
+this feature. You can now add a new `Data source` type variable. That will
+automatically be filled with instance names of your data sources.
+
+
+
+You can then use this variable as the panel data source:
+
+
+
+This will allow you to quickly change data source server and reuse the
+same dashboard for different instances of your metrics backend. For example
+you might have Graphite running in multiple data centers or environments.
+
+## Prometheus, InfluxDB, and OpenTSDB improvements
+
+All three of these popular included Data Sources have seen a variety
+of improvements in this release. Here are some highlights:
+
+### Prometheus
+
+The Prometheus Data Source now supports annotations.
+
+### InfluxDB
+
+You can now select the InfluxDB policy from the query editor.
+
+
+Grafana 3.0 also comes with support for InfluxDB 0.11 and InfluxDB 0.12.
+
+### OpenTSDB
+
+OpenTSDB 2.2 is better supported and now supports millisecond precision.
+
+## Breaking changes
+
+Dashboards from v2.6 are compatible; no manual updates should be necessary. There could
+be some edge case scenarios where dashboards using templating could stop working.
+If that is the case just enter the edit view for the template variable and hit Update button.
+This is due to a simplification of the variable format system where template variables are
+now stored without any formatting (glob/regex/etc), this is done on the fly when the
+variable is interpolated.
+
+* Plugin API: The plugin API has changed so if you are using a custom
+data source (or panel) they need to be updated as well.
+
+* InfluxDB 0.8: This data source is no longer included in releases,
+you can still install manually from [Grafana.net](http://grafana.net)
+
+* KairosDB: This data source has also no longer shipped with Grafana,
+you can install it manually from [Grafana.net](http://grafana.net)
+
+## Plugin showcase
+
+Discovering and installing plugins is very quick and easy with Grafana 3.0 and [Grafana.net](https://grafana.net). Here
+are a couple that I incurage you try!
+
+#### [Clock Panel](https://grafana.net/plugins/grafana-clock-panel)
+Support's both current time and count down mode.
+
+
+#### [Pie Chart Panel](https://grafana.net/plugins/grafana-piechart-panel)
+A simple pie chart panel is now available as an external plugin.
+
+
+#### [WorldPing App](https://grafana.net/plugins/raintank-worldping-app)
+This is full blown Grafana App that adds new panels, data sources and pages to give
+feature rich global performance monitoring directly from your on-prem Grafana.
+
+
+
+#### [Zabbix App](https://grafana.net/plugins/alexanderzobnin-zabbix-app)
+This app contains the already very pouplar Zabbix data source plugin, 2 dashboards and a triggers panel. It is
+created and maintained by [Alexander Zobnin](https://github.com/alexanderzobnin/grafana-zabbix).
+
+
+
+Checkout the full list of plugins on [Grafana.net](https://grafana.net/plugins)
+
+## CHANGELOG
+
+For a detailed list and link to github issues for everything included
+in the 3.0 release please view the
+[CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
+file.
diff --git a/docs/sources/guides/whats-new-in-v4-1.md b/docs/sources/guides/whats-new-in-v4-1.md
new file mode 100644
index 00000000000..b4e3b9f904c
--- /dev/null
+++ b/docs/sources/guides/whats-new-in-v4-1.md
@@ -0,0 +1,70 @@
++++
+title = "What's New in Grafana v4.1 beta"
+description = "Feature & improvement highlights for Grafana v4.1 beta"
+keywords = ["grafana", "new", "documentation", "4.1.0-beta1"]
+type = "docs"
+[menu.docs]
+name = "Version 4.1 beta"
+identifier = "v4.1"
+parent = "whatsnew"
+weight = -1
++++
+
+
+## Whats new in Grafana v4.1 beta
+- **Graph**: Support for shared 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)
+- **Victorops**: Add VictorOps notification integration [#6411](https://github.com/grafana/grafana/issues/6411), thx [@ichekrygin](https://github.com/ichekrygin)
+- **Opsgenie**: Add OpsGenie notification integratiion [#6687](https://github.com/grafana/grafana/issues/6687), thx [@kylemcc](https://github.com/kylemcc)
+- **Cloudwatch**: Make it possible to specify access and secret key on the data source config page [#6697](https://github.com/grafana/grafana/issues/6697)
+- **Elasticsearch**: Added support for Elasticsearch 5.x [#5740](https://github.com/grafana/grafana/issues/5740), thx [@lpic10](https://github.com/lpic10)
+- **Panel**: Added help text for panels. [#4079](https://github.com/grafana/grafana/issues/4079), thx [@utkarshcmu](https://github.com/utkarshcmu)
+- [Full changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
+
+### Shared tooltip
+
+{{< imgbox max-width="60%" img="/img/docs/v41/shared_tooltip.gif" caption="Shared tooltip" >}}
+
+Showing the tooltip on all panels at the same time has been a long standing request in Grafana and we are really happy to finally be able to release it.
+You can enable/disable the shared tooltip from the dashboard settings menu or cycle between default, shared tooltip and shared crosshair by pressing `CTRL + O` or `CMD + O`.
+
+
+
+### Help text for panel
+
+{{< imgbox max-width="60%" img="/img/docs/v41/helptext_for_panel_settings.png" caption="Hovering help text" >}}
+
+You can set a help text in the general tab on any panel. The help text is using Markdown to enable better formating and linking to other sites that can provide more information.
+
+
+
+{{< imgbox max-width="60%" img="/img/docs/v41/helptext_hover.png" caption="Hovering help text" >}}
+
+Panels with a help text available have a little indicator in the top left corner. You can show the help text by hovering the icon.
+
+
+
+### Easier Cloudwatch configuration
+
+{{< imgbox max-width="60%" img="/img/docs/v41/cloudwatch_settings.png" caption="Cloudwatch configuration" >}}
+
+In Grafana 4.1.0 you can configure your Cloudwatch data source with `access key` and `secret key` directly in the data source configuration page.
+This enables people to use the Cloudwatch data source without having access to the filesystem where Grafana is running.
+
+Once the `access key` and `secret key` have been saved the user will no longer be able to view them.
+
+
+## Upgrade & Breaking changes
+
+Elasticsearch 1.x is no longer supported. Please upgrade to Elasticsearch 2.x or 5.x. Otherwise Grafana 4.1.0-beta1 contains no breaking changes.
+
+## Changelog
+
+Checkout the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list
+of new features, changes, and bug fixes.
+
+## Download
+
+Head to [v4.1 download page](/download/4_1_0/) for download links & instructions.
+
+## Thanks
+A big thanks to all the Grafana users who contribute by submitting PRs, bug reports & feedback!
diff --git a/docs/sources/guides/whats-new-in-v4.md b/docs/sources/guides/whats-new-in-v4.md
new file mode 100644
index 00000000000..71a5c0251da
--- /dev/null
+++ b/docs/sources/guides/whats-new-in-v4.md
@@ -0,0 +1,180 @@
++++
+title = "What's New in Grafana v4.0"
+description = "Feature & improvement highlights for Grafana v4.0"
+keywords = ["grafana", "new", "documentation", "4.0"]
+type = "docs"
+[menu.docs]
+name = "Version 4.0 (Latest)"
+identifier = "v4.0"
+parent = "whatsnew"
+weight = -1
++++
+
+# What's New in Grafana v4.0
+
+As usual this release contains a ton of minor new features, fixes and improved UX. But on top of the usual new goodies
+is a core new feature: Alerting! Read on below for a detailed description of what's new in v4.0.
+
+## Alerting
+
+{{< imgbox max-width="40%" img="/img/docs/v4/drag_handles_gif.gif" caption="Alerting overview" >}}
+
+Alerting is a really revolutionary feature for Grafana. It transforms Grafana from a
+visualization tool into a truly mission critical monitoring tool. The alert rules are very easy to
+configure using your existing graph panels and threshold levels can be set simply by dragging handles to
+the right side of the graph. The rules will continually be evaluated by grafana-server and
+notifications will be sent out when the rule conditions are met.
+
+This feature has been worked on for over a year with many iterations and rewrites
+just to make sure the foundations are really solid. We are really proud to finally release it!
+Since the alerting execution is processed in the backend all data source plugins are not supported.
+Right now Graphite, Prometheus, InfluxDB and OpenTSDB are supported. Elasticsearch is being worked
+on but will be not ready for v4 release.
+
+
+
+### Rules
+
+{{< imgbox max-width="40%" img="/img/docs/v4/alerting_conditions.png" caption="Alerting Conditions" >}}
+
+The rule config allows you to specify a name, how often the rule should be evaluated and a series
+of conditions that all need to be true for the alert to fire.
+
+Currently the only condition type that exists is a `Query` condition that allows you to
+specify a query letter, time range and an aggregation function. The letter refers to
+a query you already have added in the **Metrics** tab. The result from the
+query and the aggregation function is a single value that is then used in the threshold check.
+
+We plan to add other condition types in the future, like `Other Alert`, where you can include the state
+of another alert in your conditions, and `Time Of Day`.
+
+### Notifications
+
+{{< imgbox max-width="40%" img="/img/docs/v4/slack_notification.png" caption="Alerting Slack Notification" >}}
+
+Alerting would not be very useful if there was no way to send notifications when rules trigger and change state. You
+can setup notifications of different types. We currently have `Slack`, `PagerDuty`, `Email` and `Webhook` with more in the
+pipe that will be added during beta period. The notifications can then be added to your alert rules.
+If you have configured an external image store in the grafana.ini config file (s3 and webdav options available)
+you can get very rich notifications with an image of the graph and the metric
+values all included in the notification.
+
+### Annotations
+
+Alert state changes are recorded in a new annotation store that is built into Grafana. This store
+currently only supports storing annotations in Grafana's own internal database (mysql, postgres or sqlite).
+The Grafana annotation storage is currently only used for alert state changes but we hope to add the ability for users
+to add graph comments in the form of annotations directly from within Grafana in a future release.
+
+### Alert List Panel
+
+{{< imgbox max-width="30%" img="/img/docs/v4/alert_list_panel.png" caption="Alert List Panel" >}}
+
+This new panel allows you to show alert rules or a history of alert rule state changes. You can filter based on states your
+interested in. Very useful panel for overview style dashboards.
+
+
+
+## Ad-hoc filter variable
+
+{{< imgbox max-width="30%" img="/img/docs/v4/adhoc_filters.gif" caption="Ad-hoc filters variable" >}}
+
+This is a new and very different type of template variable. It will allow you to create new key/value filters on the fly.
+With autocomplete for both key and values. The filter condition will be automatically applied to all
+queries that use that data source. This feature opens up more exploratory dashboards. In the gif animation to the right
+you have a dashboard for Elasticsearch log data. It uses one query variable that allow you to quickly change how the data
+is grouped, and an interval variable for controlling the granularity of the time buckets. What was missing
+was a way to dynamically apply filters to the log query. With the `Ad-Hoc Filters` variable you can
+dynamically add filters to any log property!
+
+## UX Improvements
+
+We always try to bring some UX/UI refinements & polish in every release.
+
+### TV-mode & Kiosk mode
+
+
+
+
As a Grafana Administrator, you have complete access to any Organization or User in that instance of Grafana.
When performing actions as a Grafana admin, the sidebar will change it's appearance as below to indicate you are performing global server administration.
@@ -32,6 +37,6 @@ From the Grafana Server Admin page, you can access the System Info page which su
Organizations in Grafana are best suited for a **multi-tenant deployment**. In a multi-tenant deployment,
Organizations can be used to provide a full Grafana experience to different sets of users from a single Grafana instance,
-at the convenience of the Grafana Administrator.
+at the convenience of the Grafana Administrator.
-In most cases, a Grafana installation will only have **one** Organization. Since dashboards, data sources and other configuration items are not shared between organizations, there's no need to create multiple Organizations if you want all your users to have access to the same set of dashboards and data.
+In most cases, a Grafana installation will only have **one** Organization. Since dashboards, data sources and other configuration items are not shared between organizations, there's no need to create multiple Organizations if you want all your users to have access to the same set of dashboards and data.
diff --git a/docs/sources/reference/annotations.md b/docs/sources/reference/annotations.md
index 51852abcdf2..8f2170ba145 100644
--- a/docs/sources/reference/annotations.md
+++ b/docs/sources/reference/annotations.md
@@ -1,15 +1,19 @@
-----
-page_title: Annotations
-page_description: Annotations user guide
-page_keywords: grafana, annotations, guide, documentation
----
++++
+title = "Annotations"
+keywords = ["grafana", "annotations", "documentation", "guide"]
+type = "docs"
+[menu.docs]
+name = "Annotations"
+parent = "dashboard_features"
+weight = 2
++++
# Annotations
Annotations provide a way to mark points on the graph with rich events. When you hover over an annotation
you can get title, tags, and text information for the event.
-
+
To add an annotation query click dashboard settings icon in top menu and select `Annotations` from the
dropdown. This will open the `Annotations` edit view. Click the `Add` tab to add a new annotation query.
@@ -24,7 +28,7 @@ Graphite supports two ways to query annotations.
- Graphite events query, use the `Graphite event tags` text input, specify an tag or wildcard (leave empty should also work)
## Elasticsearch annotations
-
+
Grafana can query any Elasticsearch index for annotation events. The index name can be the name of an alias or an index wildcard pattern.
You can leave the search query blank or specify a lucene query.
@@ -35,8 +39,16 @@ as the name for the fields that should be used for the annotation title, tags an
> **Note** The annotation timestamp field in elasticsearch need to be in UTC format.
## InfluxDB Annotations
-
+
For InfluxDB you need to enter a query like in the above screenshot. You need to have the ```where $timeFilter``` part.
If you only select one column you will not need to enter anything in the column mapping fields.
+## Prometheus Annotations
+
+
+
+Prometheus supports two ways to query annotations.
+
+- A regular metric query
+- A Prometheus query for pending and firing alerts (for details see [Inspecting alerts during runtime](https://prometheus.io/docs/alerting/rules/#inspecting-alerts-during-runtime))
diff --git a/docs/sources/reference/dashboard.md b/docs/sources/reference/dashboard.md
index 93adf5cd789..c1c574ce917 100644
--- a/docs/sources/reference/dashboard.md
+++ b/docs/sources/reference/dashboard.md
@@ -1,13 +1,15 @@
-----
-page_title: Dashboard JSON
-page_description: Dashboard JSON Reference
-page_keywords: grafana, dashboard, json, documentation
----
++++
+title = "JSON Model"
+keywords = ["grafana", "dashboard", "documentation", "json", "model"]
+type = "docs"
+[menu.docs]
+name = "JSON Model"
+parent = "dashboard_features"
+weight = 100
++++
# Dashboard JSON
-## Overview
-
A dashboard in Grafana is represented by a JSON object, which stores metadata of its dashboard. Dashboard metadata includes dashboard properties, metadata from rows, panels, template variables, panel queries, etc.
To view the JSON of a dashboard, follow the steps mentioned below:
@@ -26,13 +28,12 @@ When a user creates a new dashboard, a new dashboard JSON object is initialized
{
"id": null,
"title": "New dashboard",
- "originalTitle": "New dashboard",
"tags": [],
"style": "dark",
"timezone": "browser",
"editable": true,
"hideControls": false,
- "sharedCrosshair": false,
+ "graphTooltip": 1,
"rows": [],
"time": {
"from": "now-6h",
@@ -59,13 +60,12 @@ Each field in the dashboard JSON is explained below with its usage:
| ---- | ----- |
| **id** | unique dashboard id, an integer |
| **title** | current title of dashboard |
-| **originalTitle** | title of dashboard when saved for the first time |
| **tags** | tags associated with dashboard, an array of strings |
| **style** | theme of dashboard, i.e. `dark` or `light` |
| **timezone** | timezone of dashboard, i.e. `utc` or `browser` |
| **editable** | whether a dashboard is editable or not |
| **hideControls** | whether row controls on the left in green are hidden or not |
-| **sharedCrosshair** | TODO |
+| **graphTooltip** | TODO |
| **rows** | row metadata, see [rows section](/docs/sources/reference/dashboard.md/#rows) for details |
| **time** | time range for dashboard, i.e. last 6 hours, last 7 days, etc |
| **timepicker** | timepicker metadata, see [timepicker section](/docs/sources/reference/dashboard.md/#timepicker) for details |
diff --git a/docs/sources/reference/dashlist.md b/docs/sources/reference/dashlist.md
index ea098541da2..5377c7c1941 100644
--- a/docs/sources/reference/dashlist.md
+++ b/docs/sources/reference/dashlist.md
@@ -1,29 +1,32 @@
-----
-page_title: Dashlist Panel
-page_description: Dashlist Panel Reference
-page_keywords: grafana, dashlist, panel, documentation
----
++++
+title = "Dashboard List"
+keywords = ["grafana", "dashboard list", "documentation", "panel", "dashlist"]
+type = "docs"
+[menu.docs]
+name = "Dashboard list"
+parent = "panels"
+weight = 4
++++
-# Dashlist Panel
-## Overview
+# Dashboard List Panel
-The dashboard list panel allows you to display dynamic links to other dashboards. The list can be configured to use starred dashboards, a search query and/or dashboard tags.
+The dashboard list panel allows you to display dynamic links to other dashboards. The list can be configured to use starred dashboards, a search query and/or dashboard tags.
-
+
> On each dashboard load, the dashlist panel will re-query the dashboard list, always providing the most up to date results.
## Mode: Starred Dashboards
-The `starred` dashboard selection displays starred dashboards, up to the number specified in the `Limit Number to` field, in alphabetical order. On dashboard load, the dashlist panel will re-query the favorites to appear in dashboard list panel, always providing the most up to date results.
+The `starred` dashboard selection displays starred dashboards, up to the number specified in the `Limit Number to` field, in alphabetical order. On dashboard load, the dashlist panel will re-query the favorites to appear in dashboard list panel, always providing the most up to date results.
-
+
## Mode: Search Dashboards
-The panel may be configured to search by either string query or tag(s). On dashboard load, the dashlist panel will re-query the dashboard list, always providing the most up to date results.
+The panel may be configured to search by either string query or tag(s). On dashboard load, the dashlist panel will re-query the dashboard list, always providing the most up to date results.
To configure dashboard list in this manner, select `search` from the Mode select box. When selected, the Search Options section will appear.
@@ -38,14 +41,14 @@ Limit number to | Specify the maximum number of dashboards
### Search by string
-To search by a string, enter a search query in the `Search Options: Query` field. Queries are case-insensitive, and partial values are accepted.
-
+To search by a string, enter a search query in the `Search Options: Query` field. Queries are case-insensitive, and partial values are accepted.
+
### Search by tag
-To search by one or more tags, enter your selection in the `Search Options: Tags:` field. Note that existing tags will not appear as you type, and *are* case sensitive. To see a list of existing tags, you can always return to the dashboard, open the Dashboard Picker at the top and click `tags` link in the search bar.
-
+To search by one or more tags, enter your selection in the `Search Options: Tags:` field. Note that existing tags will not appear as you type, and *are* case sensitive. To see a list of existing tags, you can always return to the dashboard, open the Dashboard Picker at the top and click `tags` link in the search bar.
+
-> When multiple tags and strings appear, the dashboard list will display those matching ALL conditions.
+> When multiple tags and strings appear, the dashboard list will display those matching ALL conditions.
diff --git a/docs/sources/reference/export_import.md b/docs/sources/reference/export_import.md
index e83c68401d4..bc05795c030 100644
--- a/docs/sources/reference/export_import.md
+++ b/docs/sources/reference/export_import.md
@@ -1,85 +1,109 @@
----
-page_title: Export & Import Guide
-page_description: Export & Import Guide for Grafana
-page_keywords: grafana, export, import, documentation
----
++++
+title = "Export & Import"
+keywords = ["grafana", "dashboard", "documentation", "export", "import"]
+type = "docs"
+[menu.docs]
+parent = "dashboard_features"
+weight = 8
++++
# Export and Import
+Grafana Dashboards can easily be exported and imported, either from the UI or from the HTTP API.
+
## Exporting a dashboard
-Dashboards are exported in Grafana JSON format, and contain everything you need (layout, variables, styles, data sources, queries, etc)to import the dashboard at a later time.
+Dashboards are exported in Grafana JSON format, and contain everything you need (layout, variables, styles, data sources, queries, etc)to import the dashboard at a later time.
-#### Export to file
+The export feature is accessed from the share menu.
-To export a dashboard, locate the settings menu within the desired dashboard and click the gear icon. The export option will always be available, and will open a browser save-as dialog window.
+
+### Making a dashboard portable
-#### Copy JSON
+If you want to export a dashboard for others to use then it could be a good idea to
+add template variables for things like a metric prefix (use constant variable) and server name.
-The raw JSON may be accessed directly from within the interface and copy/pasted into an editor of your choice to be saved later. To view this JSON, locate the settings menu within the desired dashboard and click the gear icon. The View JSON option will always be available, and will open the raw JSON in a text area. To copy the entire JSON file, click into the text area, the select all `CTRL`+`A` (PC, Linux) or `⌘`+`A` (Mac).
-
-
+A template variable of the type `Constant` will automatically be hidden in
+the dashboard, and will also be added as an required input when the dashboard is imported.
## Importing a dashboard
-Grafana 2.0 now has integrated dashboard storage engine that can be configured to use an internal sqlite3 database, MySQL, or Postgres. This eliminates the need to use Elasticsearch for dashboard storage for Graphite users. Grafana 2.0 does not support storing dashboards in InfluxDB.
+To import a dashboard open dashboard search and then hit the import button.
-The import view can be found at the Dashboard Picker dropdown, next to the New Dashboard and Playlist buttons.
+
+From here you can upload a dashboard json file, paste a [Grafana.net](https://grafana.net) dashboard
+url or paste dashboard json text directly into the text area.
+
+
Clicking the title for a panel exposes a menu. The `edit` option opens additional configuration
options for the panel.
## General
-
+
The general tab allows customization of a panel's appearance and menu options.
@@ -44,15 +48,9 @@ populate the template variable to a desired value from the link.
The metrics tab defines what series data and sources to render. Each datasource provides different
options.
-### Graphite
-
-### InfluxDB
-
-### OpenTSDB
-
## Axes & Grid
-
+
The Axes & Grid tab controls the display of axes, grids and legend.
@@ -67,9 +65,6 @@ The ``Left Y`` and ``Right Y`` can be customized using:
Axes can also be hidden by unchecking the appropriate box from `Show Axis`.
-Thresholds allow you to add arbitrary lines or sections to the graph to make it easier to see when
-the graph crosses a particular threshold.
-
### Legend
The legend hand be hidden by checking the ``Show`` checkbox. If it's shown, it can be
@@ -91,14 +86,20 @@ The legend values are calculated client side by Grafana and depend on what type
aggregation or point consolidation you metric query is using. All the above legend values cannot
be correct at the same time. For example if you plot a rate like requests/second, this is probably
using average as aggregator, then the Total in the legend will not represent the total number of requests.
-It is just the sum of all data data points received by Grafana.
+It is just the sum of all data points received by Grafana.
## Display styles
-
+
Display styles controls properties of the graph.
+### Thresholds
+
+Thresholds allow you to add arbitrary lines or sections to the graph to make it easier to see when
+the graph crosses a particular threshold.
+
+
### Chart Options
- ``Bar`` - Display values as a bar chart
@@ -140,4 +141,4 @@ a thicker line width to make it standout.
## Time range
-
+
diff --git a/docs/sources/reference/keyboard_shortcuts.md b/docs/sources/reference/keyboard_shortcuts.md
index 9947418ae5a..edd2e85f43b 100644
--- a/docs/sources/reference/keyboard_shortcuts.md
+++ b/docs/sources/reference/keyboard_shortcuts.md
@@ -1,7 +1,11 @@
-page_title: Keyboard Shortcuts
-page_description: Keyboard Shortcuts for Grafana
-page_keywords: grafana, export, import, documentation
----
++++
+title = "Keyboard shortcuts"
+keywords = ["grafana", "dashboard", "documentation", "shortcuts"]
+type = "docs"
+[menu.docs]
+parent = "dashboard_features"
+weight = 8
++++
# Keyboard Shortcuts
@@ -11,7 +15,7 @@ No mouse? No problem. Grafana has extensive keyboard shortcuts to allow you to n
Press `Shift`+`?` to open the keyboard shortcut dialog from anywhere within the dashboard views.
-
+
|Shortcut|Action|
diff --git a/docs/sources/reference/playlist.md b/docs/sources/reference/playlist.md
index 5d546b1a3df..359a5d8f3bd 100644
--- a/docs/sources/reference/playlist.md
+++ b/docs/sources/reference/playlist.md
@@ -1,8 +1,12 @@
----
-page_title: Playlist Guide
-page_description: Playlist guide for Grafana
-page_keywords: grafana, playlist, documentation
----
++++
+title = "Playlist"
+keywords = ["grafana", "dashboard", "documentation", "playlist"]
+type = "docs"
+[menu.docs]
+parent = "dashboard_features"
+weight = 4
++++
+
# Playlist
@@ -12,9 +16,9 @@ Since Grafana automatically scales Dashboards to any resolution they're perfect
## Creating a Playlist
-The Playlist feature can be accessed from Grafana's sidemenu. Click the 'Playlist' button from the sidemenu to access the Playlist functionality. When 'Playlist' button is clicked, playlist view will open up showing saved playlists and an option to create new playlists.
+{{< docs-imagebox img="img/docs/v3/playlist.png" max-width="25rem" >}}
-
+The Playlist feature can be accessed from Grafana's sidemenu, in the Dashboard submenu.
Click on "New Playlist" button to create a new playlist. Firstly, name your playlist and configure a time interval for Grafana to wait on a particular Dashboard before advancing to the next one on the Playlist.
diff --git a/docs/sources/reference/scripting.md b/docs/sources/reference/scripting.md
index d896a2c7650..551805b567a 100644
--- a/docs/sources/reference/scripting.md
+++ b/docs/sources/reference/scripting.md
@@ -1,8 +1,12 @@
-----
-page_title: Scripted dashboards
-page_description: Scripted dashboards
-page_keywords: grafana, scripted, guide, documentation
----
++++
+title = "Scripted Dashboards"
+keywords = ["grafana", "dashboard", "documentation", "scripted"]
+type = "docs"
+[menu.docs]
+parent = "dashboard_features"
+weight = 9
++++
+
# Scripted Dashboards
diff --git a/docs/sources/reference/search.md b/docs/sources/reference/search.md
index e2d6647229c..9fc4d47893c 100644
--- a/docs/sources/reference/search.md
+++ b/docs/sources/reference/search.md
@@ -1,54 +1,58 @@
-----
-page_title: Dashboard Search
-page_description: Dashboard Search in Grafana
-page_keywords: grafana, search, guide, documentation
----
++++
+title = "Search"
+keywords = ["grafana", "dashboard", "documentation", "search"]
+type = "docs"
+[menu.docs]
+parent = "dashboard_features"
+weight = 5
++++
+
# Dashboard Search
Dashboards can be searched by the dashboard name, filtered by one (or many) tags or filtered by starred status. The dashboard search is accessed through the dashboard picker, available in the dashboard top nav area.
-
1. `Dashboard Picker`: The Dashboard Picker is your primary navigation tool to move between dashboards. It is present on all dashboards, and open the Dashboard Search. The dashboard picker also doubles as the title of the current dashboard.
2. `Search Bar`: The search bar allows you to enter any string and search both database and file based dashboards in real-time.
-3. `Starred`: The starred link allows you to filter the list to display only starred dashboards.
-4. `Tags`: The tags filter allows you to filter the list by dashboard tags.
+3. `Starred`: The starred link allows you to filter the list to display only starred dashboards.
+4. `Tags`: The tags filter allows you to filter the list by dashboard tags.
When using only a keyboard, you can use your keyboard arrow keys to navigate the results, hit enter to open the selected dashboard.
## Find by dashboard name
-
+
-To search and load dashboards click the open folder icon in the header or use the shortcut `CTRL`+`F`. Begin typing any part of the desired dashboard names. Search will return results for for any partial string match in real-time, as you type.
+To search and load dashboards click the open folder icon in the header or use the shortcut `CTRL`+`F`. Begin typing any part of the desired dashboard names. Search will return results for for any partial string match in real-time, as you type.
Dashboard search is:
- Real-time
- *Not* case sensitive
-- Functional across stored *and* file based dashboards.
+- Functional across stored *and* file based dashboards.
## Filter by Tag(s)
Tags are a great way to organize your dashboards, especially as the number of dashboards grow. Tags can be added and managed in the dashboard `Settings`.
-To filter the dashboard list by tag, click on any tag appearing in the right column. The list may be further filtered by clicking on additional tags:
+To filter the dashboard list by tag, click on any tag appearing in the right column. The list may be further filtered by clicking on additional tags:
-
+
Alternately, to see a list of all available tags, click the tags link in the search bar. All tags will be shown, and when a tag is selected, the dashboard search will be instantly filtered:
-
+
When using only a keyboard: `tab` to focus on the *tags* link, `▼` down arrow key to find a tag and select with the `Enter` key.
-**Note**: When multiple tags are selected, Grafana will show dashboards that include **all**.
+**Note**: When multiple tags are selected, Grafana will show dashboards that include **all**.
## Filter by Starred
Starring is a great way to organize and find commonly used dashboards. To show only starred dashboards in the list, click the *starred* link in the search bar:
-
+
-When using only a keyboard: `tab` to focus on the *stars* link, `▼` down arrow key to find a tag and select with the `Enter` key.
\ No newline at end of file
+When using only a keyboard: `tab` to focus on the *stars* link, `▼` down arrow key to find a tag and select with the `Enter` key.
diff --git a/docs/sources/reference/sharing.md b/docs/sources/reference/sharing.md
index c20f4e5f67c..5210b2811df 100644
--- a/docs/sources/reference/sharing.md
+++ b/docs/sources/reference/sharing.md
@@ -1,8 +1,11 @@
-----
-page_title: Sharing
-page_description: Sharing
-page_keywords: grafana, sharing, guide, documentation
----
++++
+title = "Sharing"
+keywords = ["grafana", "dashboard", "documentation", "sharing"]
+type = "docs"
+[menu.docs]
+parent = "dashboard_features"
+weight = 6
++++
# Sharing features
Grafana provides a number of ways to share a dashboard or a specific panel to other users within your
@@ -19,7 +22,7 @@ A dashboard snapshot is an instant way to share an interactive dashboard publicl
(metric, template and annotation) and panel links, leaving only the visible metric data and series names embedded into your dashboard. Dashboard
snapshots can be accessed by anyone who has the link and can reach the URL.
-
+
### Publish snapshots
You can publish snapshots to you local instance or to [snapshot.raintank.io](http://snapshot.raintank.io). The later is a free service
diff --git a/docs/sources/reference/singlestat.md b/docs/sources/reference/singlestat.md
index 954bfeed8b7..ed0a956b7eb 100644
--- a/docs/sources/reference/singlestat.md
+++ b/docs/sources/reference/singlestat.md
@@ -1,12 +1,17 @@
-----
-page_title: Singlestat Panel
-page_description: Singlestat Panel Reference
-page_keywords: grafana, singlestat, panel, documentation
----
++++
+title = "Singlestat Panel"
+keywords = ["grafana", "dashboard", "documentation", "panels", "singlestat"]
+type = "docs"
+[menu.docs]
+name = "Singlestat"
+parent = "panels"
+weight = 2
++++
+
# Singlestat Panel
-
+
The Singlestat Panel allows you to show the one main summary stat of a SINGLE series. It reduces the series into a single number (by looking at the max, min, average, or sum of values in the series). Singlestat also provides thresholds to color the stat or the Panel background. It can also translate the single number into a text value, and show a sparkline summary of the series.
@@ -14,11 +19,19 @@ The Singlestat Panel allows you to show the one main summary stat of a SINGLE se
The singlestat panel has a normal query editor to allow you define your exact metric queries like many other Panels. Through the Options tab, you can access the Singlestat-specific functionality.
-
+
1. `Big Value`: Big Value refers to how we display the main stat for the Singlestat Panel. This is always a single value that is displayed in the Panel in between two strings, `Prefix` and `Suffix`. The single number is calculated by choosing a function (min,max,average,current,total) of your metric query. This functions reduces your query into a single numeric value.
2. `Font Size`: You can use this section to select the font size of the different texts in the Singlestat Panel, i.e. prefix, value and postfix.
-3. `Values`: The Value fields let you set the function (min, max, average, current, total) that your entire query is reduced into a single value with. You can also set the font size of the Value field and font-size (as a %) of the metric query that the Panel is configured with. This reduces the entire query into a single summary value that is displayed.
+3. `Values`: The Value fields let you set the function (min, max, average, current, total, first, delta, range) that your entire query is reduced into a single value with. You can also set the font size of the Value field and font-size (as a %) of the metric query that the Panel is configured with. This reduces the entire query into a single summary value that is displayed.
+ * `min` - The smallest value in the series
+ * `max` - The largest value in the series
+ * `average` - The average of all the non-null values in the series
+ * `current` - The last value in the series. If the series ends on null the previous value will be used.
+ * `total` - The sum of all the non-null values in the series
+ * `first` - The first value in the series
+ * `delta` - The total incremental increase (of a counter) in the series. An attempt is made to account for counter resets, but this will only be accurate for single instance metrics. Used to show total counter increase in time series.
+ * `range` - The difference between 'min' and 'max'. Useful the show the range of change for a gauge.
4. `Postfixes`: The Postfix fields let you define a custom label and font-size (as a %) to appear *after* the value
5. `Units`: Units are appended to the the Singlestat within the panel, and will respect the color and threshold settings for the value.
6. `Decimals`: The Decimal field allows you to override the automatic decimal precision, and set it explicitly.
@@ -27,19 +40,19 @@ The singlestat panel has a normal query editor to allow you define your exact me
The coloring options of the Singlestat Panel config allow you to dynamically change the colors based on the Singlestat value.
-
+
1. `Background`: This checkbox applies the configured thresholds and colors to the entirety of the Singlestat Panel background.
2. `Value`: This checkbox applies the configured thresholds and colors to the summary stat.
3. `Thresholds`: Change the background and value colors dynamically within the panel, depending on the Singlestat value. The threshold field accepts **2 comma-separated** values which represent 3 ranges that correspond to the three colors directly to the right. For example: if the thresholds are 70, 90 then the first color represents < 70, the second color represents between 70 and 90 and the third color represents > 90.
4. `Colors`: Select a color and opacity
-5. `Invert order`: This link toggles the threshold color order.For example: Green, Orange, Red (
) will become Red, Orange, Green (
).
+5. `Invert order`: This link toggles the threshold color order.For example: Green, Orange, Red (
) will become Red, Orange, Green (
).
### Spark Lines
Sparklines are a great way of seeing the historical data related to the summary stat, providing valuable context at a glance. Sparklines act differently than traditional Graph Panels and do not include x or y axis, coordinates, a legend, or ability to interact with the graph.
-
+
1. `Show`: The show checkbox will toggle whether the spark line is shown in the Panel. When unselected, only the Singlestat value will appear.
2. `Background`: Check if you want the sparklines to take up the full panel width, or uncheck if they should be below the main Singlestat value.
@@ -52,13 +65,13 @@ Sparklines are a great way of seeing the historical data related to the summary
Value to text mapping allows you to translate the value of the summary stat into explicit text. The text will respect all styling, thresholds and customization defined for the value. This can be useful to translate the number of the main Singlestat value into a context-specific human-readable word or message.
-
+
## Troubleshooting
### Multiple Series Error
-
+
Grafana 2.5 introduced stricter checking for multiple-series on singlestat panels. In previous versions, the panel logic did not verify that only a single series was used, and instead, displayed the first series encountered. Depending on your data source, this could have lead to inconsistent data being shown and/or a general confusion about which metric was being displayed.
diff --git a/docs/sources/reference/table_panel.md b/docs/sources/reference/table_panel.md
index a857be38357..249886e1f57 100644
--- a/docs/sources/reference/table_panel.md
+++ b/docs/sources/reference/table_panel.md
@@ -1,12 +1,17 @@
-----
-page_title: Table Panel
-page_description: Table Panel Reference
-page_keywords: grafana, table, panel, documentation
----
++++
+title = "Table Panel"
+keywords = ["grafana", "dashboard", "documentation", "panels", "table panel"]
+type = "docs"
+[menu.docs]
+name = "Table"
+parent = "panels"
+weight = 2
++++
+
# Table Panel
-
+
1. `Data`: Control how your query is transformed into a table.
2. `Table Display`: Table display options.
@@ -25,7 +30,7 @@ The table panel has many ways to manipulate your data for optimal presentation.
## Data to Table
-
+
The data section contains the **To Table Transform (1)**. This is the primary option for how your data/metric
query should be transformed into a table format. The **Columns (2)** option allows you to select what columns
@@ -33,38 +38,38 @@ you want in the table. Only applicable for some transforms.
### Time series to rows
-
+
In the most simple mode you can turn time series to rows. This means you get a `Time`, `Metric` and a `Value` column. Where `Metric` is the name of the time series.
### Time series to columns
-
+
This transform allows you to take multiple time series and group them by time. Which will result in the primary column being `Time` and a column for each time series.
### Time series aggregations
-
+
This table transformation will lay out your table into rows by metric, allowing columns of `Avg`, `Min`, `Max`, `Total`, `Current` and `Count`. More than one column can be added.
### Annotations
-
+
If you have annotations enabled in the dashboard you can have the table show them. If you configure this
mode then any queries you have in the metrics tab will be ignored.
### JSON Data
-
+
If you have an Elasticsearch **Raw Document** query or an Elasticsearch query without a `date histogram` use this
transform mode and pick the columns using the **Columns** section.
-
+
## Table Display
-
+
1. `Pagination (Page Size)`: The table display fields allow you to control The `Pagination` (page size) is the threshold at which the table rows will be broken into pages. For example, if your table had 95 records with a pagination value of 10, your table would be split across 9 pages.
2. `Scroll`: The `scroll bar` checkbox toggles the ability to scroll within the panel, when unchecked, the panel height will grow to display all rows.
@@ -75,7 +80,7 @@ transform mode and pick the columns using the **Columns** section.
The column styles allow you control how dates and numbers are formatted.
-
+
1. `Name or regex`: The Name or Regex field controls what columns the rule should be applied to. The regex or name filter will be matched against the column name not against column values.
2. `Type`: The three supported types of types are `Number`, `String` and `Date`.
diff --git a/docs/sources/reference/templating.md b/docs/sources/reference/templating.md
index e605af845ea..636cc62a0c8 100644
--- a/docs/sources/reference/templating.md
+++ b/docs/sources/reference/templating.md
@@ -1,15 +1,18 @@
-----
-page_title: Dashboard Templating
-page_description: Dashboard Templating
-page_keywords: grafana, templating, variables, guide, documentation
----
++++
+title = "Templating"
+keywords = ["grafana", "templating", "documentation", "guide"]
+type = "docs"
+[menu.docs]
+name = "Templating"
+parent = "dashboard_features"
+weight = 1
++++
-# Dashboard Templating
-
+# Templating
-## Overview
+
-Dashboard Templating allows you to make your Dashboards more interactive and dynamic.
+Dashboard Templating allows you to make your Dashboards more interactive and dynamic.
They’re one of the most powerful and most used features of Grafana, and they’ve recently gotten even more attention in Grafana 2.0 and Grafana 2.1.
@@ -40,13 +43,13 @@ You can utilize the special ** All ** value to allow the Dashboard user to query
#### Multi-select
As of Grafana 2.1, it is now possible to select a subset of Query Template variables (previously it was possible to select an individual value or 'All', not multiple values that were less than All). This is accomplished via the Multi-Select option. If enabled, the Dashboard user will be able to enable and disable individual variables.
-The Multi-Select functionality is taken a step further with the introduction of Multi-Select Tagging. This functionality allows you to group individual Template variables together under a Tag or Group name.
+The Multi-Select functionality is taken a step further with the introduction of Multi-Select Tagging. This functionality allows you to group individual Template variables together under a Tag or Group name.
-For example, if you were using Templating to list all 20 of your applications, you could use Multi-Select Tagging to group your applications by function or region or criticality, etc.
+For example, if you were using Templating to list all 20 of your applications, you could use Multi-Select Tagging to group your applications by function or region or criticality, etc.
> Note: Multi-Select Tagging functionality is currently experimental but is part of Grafana 2.1. To enable this feature click the enable icon when editing Template options for a particular variable.
-
+
Grafana gets the list of tags and the list of values in each tag by performing two queries on your metric namespace.
@@ -58,20 +61,19 @@ Note: a proof of concept shim that translates the metric query into a SQL call i
Once configured, Multi-Select Tagging provides a convenient way to group and your template variables, and slice your data in the exact way you want. The Tags can be seen on the right side of the template pull-down.
-
-
+
### Interval
Use the `Interval` type to create Template variables around time ranges (eg. `1m`,`1h`, `1d`). There is also a special `auto` option that will change depending on the current time range, you can specify how many times the current time range should be divided to calculate the current `auto` range.
-
+
### Custom
-Use the `Custom` type to manually create Template variables around explicit values that are hard-coded into the Dashboard, and not dependent on any Data Source. You can specify multiple Custom Template values by separating them with a comma.
+Use the `Custom` type to manually create Template variables around explicit values that are hard-coded into the Dashboard, and not dependent on any Data Source. You can specify multiple Custom Template values by separating them with a comma.
-## Utilizing Template Variables with Repeating Panels and Repeating Rows
+## Repeating Panels and Repeating Rows
Template Variables can be very useful to dynamically change what you're visualizing on a given panel. Sometimes, you might want to create entire new Panels (or Rows) based on what Template Variables have been selected. This is now possible in Grafana 2.1.
diff --git a/docs/sources/reference/timerange.md b/docs/sources/reference/timerange.md
index 2ab428622bc..a4d6fc62336 100644
--- a/docs/sources/reference/timerange.md
+++ b/docs/sources/reference/timerange.md
@@ -1,32 +1,37 @@
-----
-page_title: Time Range options
-page_description: Time range user guide
-page_keywords: grafana, time range, guide, documentation
----
++++
+title = "Time Range"
+keywords = ["grafana", "dashboard", "documentation", "time range"]
+type = "docs"
+[menu.docs]
+name = "Time Range"
+parent = "dashboard_features"
+weight = 7
++++
+
# Time Range Controls
Grafana provides numerous ways to manage the time ranges of the data being visualized, both at the Dashboard-level and the Panel-level.
-
+
+
### Auto-Refresh Options
@@ -54,15 +59,15 @@ Users often ask, [when will then be now](https://www.youtube.com/watch?v=VeZ9HhH
You can override the relative time range for individual panels, causing them to be different than what is selected in the Dashboard time picker in the upper right. This allows you to show metrics from different time periods or days at the same time.
-
+
You control these overrides in panel editor mode and the tab `Time Range`.
-
+
When you zoom or change the Dashboard time to a custom absolute time range, all panel overrides will be disabled. The panel relative time override is only active when the dashboard time is also relative. The panel timeshift override is always active, even when the dashboard time is absolute.
The `Hide time override info` option allows you to hide the override info text that is by default shown in the
upper right of a panel when overridden time range options.
-Note: You can only override the dashboard time with relative time ranges. Absolute time ranges are not available.
+Note: You can only override the dashboard time with relative time ranges. Absolute time ranges are not available.
diff --git a/docs/sources/tutorials/hubot_howto.md b/docs/sources/tutorials/hubot_howto.md
index 85ebb3e7c85..17658fbaecd 100644
--- a/docs/sources/tutorials/hubot_howto.md
+++ b/docs/sources/tutorials/hubot_howto.md
@@ -1,9 +1,11 @@
----
-page_title: How To integrate Hubot and Grafana
-page_description: Hubot Grafana install guide
-page_keywords: grafana, tutorials, hubot, slack, hipchat, setup, install, config
-author: Torkel Ödegaard
----
++++
+title = "How To integrate Hubot and Grafana"
+type = "docs"
+keywords = ["grafana", "tutorials", "hubot", "slack", "hipchat", "setup", "install", "config"]
+[menu.docs]
+parent = "tutorials"
+weight = 10
++++
# How to integrate Hubot with Grafana
diff --git a/docs/sources/tutorials/index.md b/docs/sources/tutorials/index.md
index fd064ba5b15..cb11940c6dd 100644
--- a/docs/sources/tutorials/index.md
+++ b/docs/sources/tutorials/index.md
@@ -1,8 +1,9 @@
----
-page_title: Grafana Tutorials
-page_description: Tutorials
-page_keywords: grafana, tutorials
----
++++
+title = "Tutorials"
+[menu.docs]
+identifier = "tutorials"
+weight = 6
++++
# Tutorials
diff --git a/docs/sources/tutorials/screencasts.md b/docs/sources/tutorials/screencasts.md
new file mode 100644
index 00000000000..f92ead64d49
--- /dev/null
+++ b/docs/sources/tutorials/screencasts.md
@@ -0,0 +1,66 @@
++++
+title = "Screencasts"
+type = "docs"
+[menu.docs]
+identifier = "screencasts"
+parent = "guides"
+weight = 10
++++
+
+# Screencasts
+
+
+{{< screencast src="https://www.youtube.com/embed/sKNZMtoSHN4?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" >}}
+
+### Episode 7 - Beginners guide to building dashboards
+
+For newer users of Grafana, this screencast will familiarize you with the general UI and teach you how to build your first Dashboard.
+
+
+
+{{< screencast src="https://www.youtube.com/embed/9ZCMVNxUf6s?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" >}}
+
+### Episode 6 - Adding data sources, users & organizations
+
+Now that Grafana has been installed, learn about adding data sources and get a closer look at adding and managing Users and Organizations.
+
+
+
+{{< screencast src="https://www.youtube.com/embed/E-gMFv85FE8?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" >}}
+
+### Episode 5 - Installation & Configuration on Red Hat / CentOS
+
+This screencasts shows how to get Grafana 2.0 installed and configured quickly on RPM-based Linux operating systems.
+
+
+{{< screencast src="https://www.youtube.com/embed/JY22EBOR9hQ?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" >}}
+
+### Episode 4 - Installation & Configuration on Ubuntu / Debian
+
+Learn how to easily install the dependencies and packages to get Grafana 2.0 up and running on Ubuntu or Debian in just a few minutes.
+
+
+
+{{< screencast src="https://www.youtube.com/embed/FC13uhFRsVw?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" >}}
+
+### Episode 3 - Whats New In Grafana 2.0
+
+This screencast highlights many of the great new features that were included in the Grafana 2.0 release.
+
+
+
+{{< screencast src="//www.youtube.com/embed/FhNUrueWwOk?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" >}}
+### Episode 2 - Templated Graphite Queries
+
+The screencast focuses on Templating with the Graphite Data Source. Learn how to make dynamic and adaptable Dashboards for your Graphite metrics.
+
+
+
+{{< screencast src="//www.youtube.com/embed/mgcJPREl3CU?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" >}}
+### Episode 1 - Building Graphite Queries
+
+Learn how the Graphite Query Editor works, and how to use different graphing functions. There's also an introduction to graph display settings.
+
+
+
+
diff --git a/docs/sources/versions.html_fragment b/docs/sources/versions.html_fragment
index 0d62ee1e461..df6dbd4db7f 100644
--- a/docs/sources/versions.html_fragment
+++ b/docs/sources/versions.html_fragment
@@ -1,3 +1,4 @@
+
+ 
- 
+