forked from grafana/grafana
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'grafana/master' into useQueryRunner-in-…
…MetricPanelCtrl * grafana/master: build: restore postgres integration tests (grafana#16801) docs: explain correct access control model of GCS buckets (grafana#16792) Chore: Fixed no implicit any Typescript errors (grafana#16799) Feature: introduce LdapActiveSyncEnabled setting (grafana#16787) Plugins: ReactPanelPlugin to VizPanelPlugin (grafana#16779) UX: Improve Grafana usage for smaller screens (grafana#16783) ThresholdEditor: Minor style fix for smaller screens (grafana#16791) Build: Use isolated modules for ts-jest (grafana#16786) LDAP Refactoring to support syncronizing more than one user at a time. (grafana#16705) build: removes unused vendored files (fix/explore): remove vertical-align looks better for long logs (grafana#16736) Chore: bump jQuery to 3.4.0 in grafana/ui (grafana#16781) Devenv: Updated home dashboard and added new influxdb test dashboard Chore: Lowered implicit anys limit to 5946 RefreshPicker: minor design update (grafana#16774)
- Loading branch information
Showing
116 changed files
with
2,880 additions
and
1,874 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
323 changes: 323 additions & 0 deletions
323
devenv/dev-dashboards/datasource-influxdb/influxdb-templated.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,323 @@ | ||
| { | ||
| "annotations": { | ||
| "enable": false, | ||
| "list": [ | ||
| { | ||
| "builtIn": 1, | ||
| "datasource": "-- Grafana --", | ||
| "enable": true, | ||
| "hide": true, | ||
| "iconColor": "rgba(0, 211, 255, 1)", | ||
| "name": "Annotations & Alerts", | ||
| "type": "dashboard" | ||
| } | ||
| ] | ||
| }, | ||
| "editable": true, | ||
| "gnetId": null, | ||
| "graphTooltip": 0, | ||
| "iteration": 1556259111212, | ||
| "links": [], | ||
| "panels": [ | ||
| { | ||
| "aliasColors": {}, | ||
| "annotate": { | ||
| "enable": false | ||
| }, | ||
| "bars": false, | ||
| "dashLength": 10, | ||
| "dashes": false, | ||
| "datasource": "gdev-influxdb", | ||
| "editable": true, | ||
| "error": false, | ||
| "fill": 2, | ||
| "grid": {}, | ||
| "gridPos": { | ||
| "h": 9, | ||
| "w": 24, | ||
| "x": 0, | ||
| "y": 0 | ||
| }, | ||
| "id": 1, | ||
| "interval": "$summarize", | ||
| "legend": { | ||
| "alignAsTable": true, | ||
| "avg": false, | ||
| "current": false, | ||
| "max": false, | ||
| "min": false, | ||
| "rightSide": true, | ||
| "show": true, | ||
| "total": false, | ||
| "values": false | ||
| }, | ||
| "lines": true, | ||
| "linewidth": 1, | ||
| "links": [], | ||
| "nullPointMode": "connected", | ||
| "percentage": false, | ||
| "pointradius": 5, | ||
| "points": false, | ||
| "renderer": "flot", | ||
| "resolution": 100, | ||
| "scale": 1, | ||
| "seriesOverrides": [], | ||
| "spaceLength": 10, | ||
| "stack": true, | ||
| "steppedLine": false, | ||
| "targets": [ | ||
| { | ||
| "alias": "$tag_hostname", | ||
| "dsType": "influxdb", | ||
| "groupBy": [ | ||
| { | ||
| "params": ["auto"], | ||
| "type": "time" | ||
| }, | ||
| { | ||
| "params": ["hostname"], | ||
| "type": "tag" | ||
| } | ||
| ], | ||
| "measurement": "logins.count", | ||
| "policy": "default", | ||
| "query": "SELECT mean(\"value\") FROM \"logins.count\" WHERE \"hostname\" =~ /$Hostname$/ AND $timeFilter GROUP BY time($interval), \"hostname\"", | ||
| "refId": "A", | ||
| "resultFormat": "time_series", | ||
| "select": [ | ||
| [ | ||
| { | ||
| "params": ["value"], | ||
| "type": "field" | ||
| }, | ||
| { | ||
| "params": [], | ||
| "type": "mean" | ||
| } | ||
| ] | ||
| ], | ||
| "tags": [ | ||
| { | ||
| "key": "datacenter", | ||
| "operator": "=~", | ||
| "value": "/^$datacenter$/" | ||
| }, | ||
| { | ||
| "condition": "AND", | ||
| "key": "hostname", | ||
| "operator": "=~", | ||
| "value": "/^$host$/" | ||
| } | ||
| ], | ||
| "target": "" | ||
| } | ||
| ], | ||
| "thresholds": [], | ||
| "timeFrom": null, | ||
| "timeRegions": [], | ||
| "timeShift": null, | ||
| "title": "Selected Servers", | ||
| "tooltip": { | ||
| "msResolution": false, | ||
| "query_as_alias": true, | ||
| "shared": false, | ||
| "sort": 0, | ||
| "value_type": "cumulative" | ||
| }, | ||
| "type": "graph", | ||
| "xaxis": { | ||
| "buckets": null, | ||
| "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 | ||
| } | ||
| ], | ||
| "yaxis": { | ||
| "align": false, | ||
| "alignLevel": null | ||
| }, | ||
| "zerofill": true | ||
| } | ||
| ], | ||
| "refresh": false, | ||
| "schemaVersion": 18, | ||
| "style": "dark", | ||
| "tags": ["gdev", "datasource-test", "influxdb"], | ||
| "templating": { | ||
| "list": [ | ||
| { | ||
| "allValue": null, | ||
| "current": { | ||
| "text": "America", | ||
| "value": "America" | ||
| }, | ||
| "datasource": "gdev-influxdb", | ||
| "definition": "", | ||
| "hide": 0, | ||
| "includeAll": false, | ||
| "label": null, | ||
| "multi": false, | ||
| "name": "datacenter", | ||
| "options": [], | ||
| "query": "SHOW TAG VALUES WITH KEY = \"datacenter\" ", | ||
| "refresh": 1, | ||
| "regex": "", | ||
| "skipUrlSync": false, | ||
| "sort": 0, | ||
| "tagValuesQuery": null, | ||
| "tags": [], | ||
| "tagsQuery": null, | ||
| "type": "query", | ||
| "useTags": false | ||
| }, | ||
| { | ||
| "allFormat": "regex values", | ||
| "allValue": null, | ||
| "current": { | ||
| "text": "All", | ||
| "value": "$__all" | ||
| }, | ||
| "datasource": "gdev-influxdb", | ||
| "definition": "", | ||
| "hide": 0, | ||
| "includeAll": true, | ||
| "label": null, | ||
| "multi": true, | ||
| "multiFormat": "regex values", | ||
| "name": "host", | ||
| "options": [], | ||
| "query": "SHOW TAG VALUES WITH KEY = \"hostname\" WHERE \"datacenter\" =~ /^$datacenter$/", | ||
| "refresh": 1, | ||
| "refresh_on_load": false, | ||
| "regex": "", | ||
| "skipUrlSync": false, | ||
| "sort": 0, | ||
| "tagValuesQuery": null, | ||
| "tags": [], | ||
| "tagsQuery": null, | ||
| "type": "query", | ||
| "useTags": false | ||
| }, | ||
| { | ||
| "allFormat": "glob", | ||
| "auto": true, | ||
| "auto_count": 5, | ||
| "auto_min": "10s", | ||
| "current": { | ||
| "text": "1m", | ||
| "value": "1m" | ||
| }, | ||
| "datasource": null, | ||
| "hide": 0, | ||
| "includeAll": false, | ||
| "label": "", | ||
| "name": "summarize", | ||
| "options": [ | ||
| { | ||
| "selected": false, | ||
| "text": "auto", | ||
| "value": "$__auto_interval_summarize" | ||
| }, | ||
| { | ||
| "selected": true, | ||
| "text": "1m", | ||
| "value": "1m" | ||
| }, | ||
| { | ||
| "selected": false, | ||
| "text": "10m", | ||
| "value": "10m" | ||
| }, | ||
| { | ||
| "selected": false, | ||
| "text": "30m", | ||
| "value": "30m" | ||
| }, | ||
| { | ||
| "selected": false, | ||
| "text": "1h", | ||
| "value": "1h" | ||
| }, | ||
| { | ||
| "selected": false, | ||
| "text": "6h", | ||
| "value": "6h" | ||
| }, | ||
| { | ||
| "selected": false, | ||
| "text": "12h", | ||
| "value": "12h" | ||
| }, | ||
| { | ||
| "selected": false, | ||
| "text": "1d", | ||
| "value": "1d" | ||
| }, | ||
| { | ||
| "selected": false, | ||
| "text": "7d", | ||
| "value": "7d" | ||
| }, | ||
| { | ||
| "selected": false, | ||
| "text": "14d", | ||
| "value": "14d" | ||
| }, | ||
| { | ||
| "selected": false, | ||
| "text": "30d", | ||
| "value": "30d" | ||
| } | ||
| ], | ||
| "query": "1m,10m,30m,1h,6h,12h,1d,7d,14d,30d", | ||
| "refresh": 2, | ||
| "refresh_on_load": false, | ||
| "skipUrlSync": false, | ||
| "type": "interval" | ||
| }, | ||
| { | ||
| "datasource": "InfluxDB", | ||
| "filters": [], | ||
| "hide": 0, | ||
| "label": null, | ||
| "name": "adhoc", | ||
| "skipUrlSync": false, | ||
| "type": "adhoc" | ||
| } | ||
| ] | ||
| }, | ||
| "time": { | ||
| "from": "now-1h", | ||
| "to": "now" | ||
| }, | ||
| "timepicker": { | ||
| "collapse": false, | ||
| "enable": true, | ||
| "notice": false, | ||
| "now": true, | ||
| "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"], | ||
| "status": "Stable", | ||
| "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"], | ||
| "type": "timepicker" | ||
| }, | ||
| "timezone": "browser", | ||
| "title": "Datasource tests - InfluxDB Templated", | ||
| "uid": "000000002", | ||
| "version": 2 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.