Merge "Drop Travis CI support"
diff --git a/LICENSE b/LICENSE
index 3b118ea..989d0e1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
- Copyright (c) 2017 Mirantis et al.
+ Copyright (c) 2017-2019 Mirantis Inc. et al
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -11,4 +11,3 @@
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.
-
diff --git a/README.rst b/README.rst
index 42ce26d..de0d6fe 100644
--- a/README.rst
+++ b/README.rst
@@ -169,37 +169,3 @@
prometheus:
server:
is_container: false
-
-
-Documentation and Bugs
-======================
-
-To learn how to install and update salt-formulas, consult the documentation
-available online at:
-
- http://salt-formulas.readthedocs.io/
-
-In the unfortunate event that bugs are discovered, they should be reported to
-the appropriate issue tracker. Use Github issue tracker for specific salt
-formula:
-
- https://github.com/salt-formulas/salt-formula-logrotate/issues
-
-For feature requests, bug reports or blueprints affecting entire ecosystem,
-use Launchpad salt-formulas project:
-
- https://launchpad.net/salt-formulas
-
-You can also join salt-formulas-users team and subscribe to mailing list:
-
- https://launchpad.net/~salt-formulas-users
-
-Developers wishing to work on the salt-formulas projects should always base
-their work on master branch and submit pull request against specific formula.
-
- https://github.com/salt-formulas/salt-formula-logrotate
-
-Any questions or feedback is always welcome so feel free to join our IRC
-channel:
-
- #salt-formulas @ irc.freenode.net
diff --git a/debian/control b/debian/control
index e52fa05..4585611 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
Source: salt-formula-prometheus
-Maintainer: Salt Formulas Community <salt-formulas@freelists.org>
+Maintainer: Mirantis Dev <dev@mirantis.com>
Section: admin
Priority: optional
Build-Depends: salt-master, python, python-yaml, debhelper (>= 9)
Standards-Version: 3.9.6
-Homepage: https://github.com/salt-formulas/salt-formulas
-Vcs-Browser: https://github.com/salt-formulas/salt-formula-prometheus
-Vcs-Git: https://github.com/salt-formulas/salt-formula-prometheus.git
+Homepage: https://www.mirantis.com
+Vcs-Browser: https://gerrit.mcp.mirantis.com/#/admin/projects/salt-formulas/prometheus
+Vcs-Git: https://gerrit.mcp.mirantis.com/salt-formulas/prometheus.git
Package: salt-formula-prometheus
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 518bf7f..1d9acd7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: salt-formula-prometheus
-Upstream-Contact: Salt Formulas Community <salt-formulas@freelists.org>
-Source: https://github.com/salt-formulas/salt-formula-prometheus
+Upstream-Contact: Mirantis Dev <dev@mirantis.com>
+Source: https://gerrit.mcp.mirantis.com/salt-formulas/prometheus
Files: *
-Copyright: 2017 Mirantis et al.
+Copyright: 2017-2019 Mirantis Inc. et al
License: Apache-2.0
- Copyright (C) 2017 Mirantis et al.
+ Copyright (C) 2017-2019 Mirantis Inc. et al
.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/metadata.yml b/metadata.yml
index db84c56..75f0d65 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,3 +1,3 @@
name: "prometheus"
version: "0.1"
-source: "https://github.com/salt-formulas/salt-formula-prometheus"
+source: "https://gerrit.mcp.mirantis.com/salt-formulas/prometheus"
diff --git a/metadata/service/gainsight/container.yml b/metadata/service/gainsight/container.yml
index d5a221c..04d1eb5 100644
--- a/metadata/service/gainsight/container.yml
+++ b/metadata/service/gainsight/container.yml
@@ -7,3 +7,4 @@
dir:
config: /srv/volumes/local/gainsight/config
crontab: /srv/volumes/local/gainsight/cron.d
+ csv: /srv/volumes/local/gainsight/csv
\ No newline at end of file
diff --git a/metadata/service/gainsight/elasticsearch_container.yml b/metadata/service/gainsight/elasticsearch_container.yml
index 0129de2..5f1eb9f 100644
--- a/metadata/service/gainsight/elasticsearch_container.yml
+++ b/metadata/service/gainsight/elasticsearch_container.yml
@@ -7,3 +7,4 @@
dir:
config: /srv/volumes/local/gainsight_elasticsearch/config
crontab: /srv/volumes/local/gainsight_elasticsearch/cron.d
+ csv: /srv/volumes/local/gainsight_elasticsearch/csv
diff --git a/prometheus/files/grafana_dashboards/server/2.0/prometheus_performances_prometheus.json b/prometheus/files/grafana_dashboards/server/2.0/prometheus_performances_prometheus.json
index 82d35c8..0b19e15 100644
--- a/prometheus/files/grafana_dashboards/server/2.0/prometheus_performances_prometheus.json
+++ b/prometheus/files/grafana_dashboards/server/2.0/prometheus_performances_prometheus.json
@@ -4,7 +4,7 @@
"list": [
{
"builtIn": 1,
- "datasource": "prometheus",
+ "datasource": null,
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
@@ -18,7 +18,7 @@
"gnetId": null,
"graphTooltip": 0,
"id": null,
- "iteration": 1529677342097,
+ "iteration": 1544537423105,
"links": [],
"panels": [
{
@@ -74,13 +74,6 @@
"renderer": "flot",
"repeat": "instance",
"repeatDirection": "v",
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.21",
- "value": "10.0.0.21"
- }
- },
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
@@ -189,13 +182,6 @@
"renderer": "flot",
"repeat": "instance",
"repeatDirection": "v",
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.21",
- "value": "10.0.0.21"
- }
- },
"seriesOverrides": [
{
"alias": "/-/",
@@ -326,735 +312,6 @@
"renderer": "flot",
"repeat": "instance",
"repeatDirection": "v",
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.21",
- "value": "10.0.0.21"
- }
- },
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "rate(go_memstats_alloc_bytes_total{instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "allocation speed",
- "metric": "go_memstats_alloc_bytes",
- "refId": "A",
- "step": 60
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Allocations@${instance}",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "Bps",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "decimals": 2,
- "editable": true,
- "error": false,
- "fill": 1,
- "gridPos": {
- "h": 7,
- "w": 8,
- "x": 0,
- "y": 8
- },
- "id": 51,
- "legend": {
- "alignAsTable": false,
- "avg": false,
- "current": false,
- "hideEmpty": false,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": false,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "minSpan": 2,
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529677342097,
- "repeatPanelId": 9,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.23",
- "value": "10.0.0.23"
- }
- },
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "rate(process_cpu_seconds_total{instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "CPU seconds",
- "metric": "prometheus_local_storage_ingested_samples_total",
- "refId": "B",
- "step": 60
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "CPU@${instance}",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": [
- "avg"
- ]
- },
- "yaxes": [
- {
- "format": "none",
- "label": "Seconds / Second",
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {
- "Allocated bytes": "#7EB26D",
- "Allocated bytes - 1m max": "#BF1B00",
- "Allocated bytes - 1m min": "#BF1B00",
- "Allocated bytes - 5m max": "#BF1B00",
- "Allocated bytes - 5m min": "#BF1B00",
- "Chunks": "#1F78C1",
- "Chunks to persist": "#508642",
- "Max chunks": "#052B51",
- "Max to persist": "#3F6833",
- "RSS": "#447EBC"
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "decimals": null,
- "editable": true,
- "error": false,
- "fill": 1,
- "gridPos": {
- "h": 7,
- "w": 8,
- "x": 8,
- "y": 8
- },
- "id": 53,
- "legend": {
- "alignAsTable": true,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "minSpan": 2,
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529677342097,
- "repeatPanelId": 6,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.23",
- "value": "10.0.0.23"
- }
- },
- "seriesOverrides": [
- {
- "alias": "/-/",
- "fill": 0
- }
- ],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "process_resident_memory_bytes{instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "RSS",
- "metric": "process_resident_memory_bytes",
- "refId": "B",
- "step": 60
- },
- {
- "expr": "prometheus_local_storage_target_heap_size_bytes{instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "target heap size",
- "metric": "go_memstats_alloc_bytes",
- "refId": "D",
- "step": 60
- },
- {
- "expr": "go_memstats_next_gc_bytes{instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "next GC",
- "metric": "go_memstats_next_gc_bytes",
- "refId": "C",
- "step": 60
- },
- {
- "expr": "go_memstats_alloc_bytes{instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "allocated",
- "metric": "go_memstats_alloc_bytes",
- "refId": "A",
- "step": 60
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Memory@${instance}",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {
- "Allocated bytes": "#F9BA8F",
- "Chunks": "#1F78C1",
- "Chunks to persist": "#508642",
- "Max chunks": "#052B51",
- "Max to persist": "#3F6833",
- "RSS": "#890F02"
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "editable": true,
- "error": false,
- "fill": 1,
- "gridPos": {
- "h": 7,
- "w": 8,
- "x": 16,
- "y": 8
- },
- "id": 55,
- "legend": {
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "show": false,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529677342097,
- "repeatPanelId": 7,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.23",
- "value": "10.0.0.23"
- }
- },
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "rate(go_memstats_alloc_bytes_total{instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "allocation speed",
- "metric": "go_memstats_alloc_bytes",
- "refId": "A",
- "step": 60
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Allocations@${instance}",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "Bps",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "decimals": 2,
- "editable": true,
- "error": false,
- "fill": 1,
- "gridPos": {
- "h": 7,
- "w": 8,
- "x": 0,
- "y": 15
- },
- "id": 52,
- "legend": {
- "alignAsTable": false,
- "avg": false,
- "current": false,
- "hideEmpty": false,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": false,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "minSpan": 2,
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529677342097,
- "repeatPanelId": 9,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.33",
- "value": "10.0.0.33"
- }
- },
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "rate(process_cpu_seconds_total{instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "CPU seconds",
- "metric": "prometheus_local_storage_ingested_samples_total",
- "refId": "B",
- "step": 60
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "CPU@${instance}",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": [
- "avg"
- ]
- },
- "yaxes": [
- {
- "format": "none",
- "label": "Seconds / Second",
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {
- "Allocated bytes": "#7EB26D",
- "Allocated bytes - 1m max": "#BF1B00",
- "Allocated bytes - 1m min": "#BF1B00",
- "Allocated bytes - 5m max": "#BF1B00",
- "Allocated bytes - 5m min": "#BF1B00",
- "Chunks": "#1F78C1",
- "Chunks to persist": "#508642",
- "Max chunks": "#052B51",
- "Max to persist": "#3F6833",
- "RSS": "#447EBC"
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "decimals": null,
- "editable": true,
- "error": false,
- "fill": 1,
- "gridPos": {
- "h": 7,
- "w": 8,
- "x": 8,
- "y": 15
- },
- "id": 54,
- "legend": {
- "alignAsTable": true,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "minSpan": 2,
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529677342097,
- "repeatPanelId": 6,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.33",
- "value": "10.0.0.33"
- }
- },
- "seriesOverrides": [
- {
- "alias": "/-/",
- "fill": 0
- }
- ],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "process_resident_memory_bytes{instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "RSS",
- "metric": "process_resident_memory_bytes",
- "refId": "B",
- "step": 60
- },
- {
- "expr": "prometheus_local_storage_target_heap_size_bytes{instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "target heap size",
- "metric": "go_memstats_alloc_bytes",
- "refId": "D",
- "step": 60
- },
- {
- "expr": "go_memstats_next_gc_bytes{instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "next GC",
- "metric": "go_memstats_next_gc_bytes",
- "refId": "C",
- "step": 60
- },
- {
- "expr": "go_memstats_alloc_bytes{instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "allocated",
- "metric": "go_memstats_alloc_bytes",
- "refId": "A",
- "step": 60
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Memory@${instance}",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {
- "Allocated bytes": "#F9BA8F",
- "Chunks": "#1F78C1",
- "Chunks to persist": "#508642",
- "Max chunks": "#052B51",
- "Max to persist": "#3F6833",
- "RSS": "#890F02"
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "editable": true,
- "error": false,
- "fill": 1,
- "gridPos": {
- "h": 7,
- "w": 8,
- "x": 16,
- "y": 15
- },
- "id": 56,
- "legend": {
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "show": false,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529677342097,
- "repeatPanelId": 7,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.33",
- "value": "10.0.0.33"
- }
- },
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
@@ -1117,7 +374,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 22
+ "y": 8
},
"id": 50,
"panels": [],
@@ -1143,7 +400,7 @@
"h": 7,
"w": 24,
"x": 0,
- "y": 23
+ "y": 9
},
"id": 24,
"legend": {
@@ -1168,231 +425,6 @@
"renderer": "flot",
"repeat": "instance",
"repeatDirection": "v",
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.21",
- "value": "10.0.0.21"
- }
- },
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": true,
- "steppedLine": false,
- "targets": [
- {
- "expr": "rate(prometheus_engine_query_duration_seconds_sum{instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "{{ slice }}",
- "metric": "prometheus_local_storage_memory_chunkdescs",
- "refId": "A",
- "step": 60
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Query Engine Speed Rate@${instance}",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "s",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {
- "Chunks": "#1F78C1",
- "Chunks to persist": "#508642",
- "Max chunks": "#052B51",
- "Max to persist": "#3F6833"
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "description": "Time spent in each mode, per second",
- "editable": true,
- "error": false,
- "fill": 1,
- "gridPos": {
- "h": 7,
- "w": 24,
- "x": 0,
- "y": 30
- },
- "id": 57,
- "legend": {
- "alignAsTable": true,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "minSpan": 2,
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529677342097,
- "repeatPanelId": 24,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.23",
- "value": "10.0.0.23"
- }
- },
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": true,
- "steppedLine": false,
- "targets": [
- {
- "expr": "rate(prometheus_engine_query_duration_seconds_sum{instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "{{ slice }}",
- "metric": "prometheus_local_storage_memory_chunkdescs",
- "refId": "A",
- "step": 60
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Query Engine Speed Rate@${instance}",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "s",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {
- "Chunks": "#1F78C1",
- "Chunks to persist": "#508642",
- "Max chunks": "#052B51",
- "Max to persist": "#3F6833"
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "description": "Time spent in each mode, per second",
- "editable": true,
- "error": false,
- "fill": 1,
- "gridPos": {
- "h": 7,
- "w": 24,
- "x": 0,
- "y": 37
- },
- "id": 58,
- "legend": {
- "alignAsTable": true,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "minSpan": 2,
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529677342097,
- "repeatPanelId": 24,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.33",
- "value": "10.0.0.33"
- }
- },
"seriesOverrides": [],
"spaceLength": 10,
"stack": true,
@@ -1455,7 +487,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 44
+ "y": 16
},
"id": 37,
"panels": [],
@@ -1481,7 +513,7 @@
"h": 7,
"w": 8,
"x": 0,
- "y": 45
+ "y": 17
},
"id": 3,
"legend": {
@@ -1577,7 +609,7 @@
"h": 7,
"w": 8,
"x": 8,
- "y": 45
+ "y": 17
},
"id": 26,
"legend": {
@@ -1670,7 +702,7 @@
"h": 7,
"w": 8,
"x": 16,
- "y": 45
+ "y": 17
},
"id": 1,
"legend": {
@@ -1754,7 +786,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 52
+ "y": 24
},
"id": 43,
"panels": [],
@@ -1780,7 +812,7 @@
"h": 7,
"w": 12,
"x": 0,
- "y": 53
+ "y": 25
},
"id": 2,
"legend": {
@@ -1881,7 +913,7 @@
"h": 7,
"w": 12,
"x": 12,
- "y": 53
+ "y": 25
},
"id": 4,
"legend": {
@@ -1977,7 +1009,7 @@
"h": 7,
"w": 12,
"x": 0,
- "y": 60
+ "y": 32
},
"id": 14,
"legend": {
@@ -2079,7 +1111,7 @@
"h": 7,
"w": 12,
"x": 12,
- "y": 60
+ "y": 32
},
"id": 25,
"legend": {
@@ -2163,7 +1195,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 67
+ "y": 39
},
"id": 45,
"panels": [],
@@ -2190,7 +1222,7 @@
"h": 7,
"w": 12,
"x": 0,
- "y": 68
+ "y": 40
},
"id": 32,
"legend": {
@@ -2218,20 +1250,27 @@
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_tsdb_wal_corruptions_total[$rate_interval])",
+ "expr": "prometheus_tsdb_wal_truncations_failed_total",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
- "legendFormat": "{{ instance }}",
+ "legendFormat": "failed@{{ instance }}",
"metric": "prometheus_local_storage_series_chunks_persisted_count",
"refId": "A",
"step": 60
+ },
+ {
+ "expr": "prometheus_tsdb_wal_truncations_total",
+ "format": "time_series",
+ "intervalFactor": 1,
+ "legendFormat": "total@{{instance}}",
+ "refId": "B"
}
],
"thresholds": [],
"timeFrom": null,
"timeShift": null,
- "title": "WAL Corruption Rate",
+ "title": "WAL Truncations",
"tooltip": {
"msResolution": false,
"shared": true,
@@ -2288,7 +1327,7 @@
"h": 7,
"w": 12,
"x": 12,
- "y": 68
+ "y": 40
},
"id": 31,
"legend": {
@@ -2316,7 +1355,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_tsdb_wal_fsync_duration_seconds_sum[$rate_interval]) / rate(prometheus_tsdb_wal_fsync_duration_seconds_count[$rate_interval])",
+ "expr": "prometheus_tsdb_wal_fsync_duration_seconds_sum / prometheus_tsdb_wal_fsync_duration_seconds_count",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
@@ -2387,7 +1426,7 @@
"h": 7,
"w": 12,
"x": 0,
- "y": 75
+ "y": 47
},
"id": 30,
"legend": {
@@ -2493,7 +1532,7 @@
"h": 7,
"w": 12,
"x": 12,
- "y": 75
+ "y": 47
},
"id": 29,
"legend": {
@@ -2577,7 +1616,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 82
+ "y": 54
},
"id": 41,
"panels": [],
@@ -2603,7 +1642,7 @@
"h": 7,
"w": 8,
"x": 0,
- "y": 83
+ "y": 55
},
"id": 19,
"legend": {
@@ -2711,7 +1750,7 @@
"h": 7,
"w": 8,
"x": 8,
- "y": 83
+ "y": 55
},
"id": 8,
"legend": {
@@ -2807,7 +1846,7 @@
"h": 7,
"w": 8,
"x": 16,
- "y": 83
+ "y": 55
},
"id": 33,
"legend": {
@@ -2903,7 +1942,7 @@
"h": 7,
"w": 8,
"x": 0,
- "y": 90
+ "y": 62
},
"id": 27,
"legend": {
@@ -2931,8 +1970,9 @@
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_tsdb_compaction_chunk_range_sum[$rate_interval]) / rate(prometheus_tsdb_compaction_chunk_range_count[$rate_interval])",
+ "expr": "prometheus_tsdb_compaction_chunk_range_seconds_sum / prometheus_tsdb_compaction_chunk_range_seconds_count",
"format": "time_series",
+ "hide": false,
"intervalFactor": 2,
"legendFormat": "{{ instance }}",
"metric": "prometheus_local_storage_series_chunks_persisted_count",
@@ -2961,7 +2001,7 @@
"yaxes": [
{
"decimals": null,
- "format": "short",
+ "format": "s",
"label": "",
"logBase": 1,
"max": null,
@@ -3000,7 +2040,7 @@
"h": 7,
"w": 8,
"x": 8,
- "y": 90
+ "y": 62
},
"id": 34,
"legend": {
@@ -3028,7 +2068,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_tsdb_compaction_chunk_samples_sum[$rate_interval]) / rate(prometheus_tsdb_compaction_chunk_samples_count[$rate_interval])",
+ "expr": "prometheus_tsdb_compaction_chunk_samples_sum / prometheus_tsdb_compaction_chunk_samples_count",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{ instance }}",
@@ -3096,7 +2136,7 @@
"h": 7,
"w": 8,
"x": 16,
- "y": 90
+ "y": 62
},
"id": 35,
"legend": {
@@ -3124,7 +2164,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_tsdb_compaction_chunk_size_sum[$rate_interval]) / rate(prometheus_tsdb_compaction_chunk_samples_sum[$rate_interval])",
+ "expr": "prometheus_tsdb_compaction_chunk_size_bytes_sum / prometheus_tsdb_compaction_chunk_samples_sum",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{ instance }}",
@@ -3186,13 +2226,7 @@
"list": [
{
"allValue": null,
- "current": {
- "tags": [],
- "text": "All",
- "value": [
- "$__all"
- ]
- },
+ "current": {},
"datasource": null,
"hide": 0,
"includeAll": true,
@@ -3200,9 +2234,10 @@
"multi": true,
"name": "instance",
"options": [],
- "query": "query_result(up{job=\"prometheus\"} == 1)",
+ "query": "query_result(up{job=~\"prometheus|prometheus_lts\"})",
"refresh": 1,
"regex": ".*instance=\"([^\"]+):9090\".*",
+ "skipUrlSync": false,
"sort": 0,
"tagValuesQuery": null,
"tags": [],
@@ -3224,7 +2259,7 @@
"name": "rate_interval",
"options": [
{
- "selected": false,
+ "selected": true,
"text": "1m",
"value": "1m"
},
@@ -3234,7 +2269,7 @@
"value": "2m"
},
{
- "selected": true,
+ "selected": false,
"text": "3m",
"value": "3m"
},
@@ -3255,6 +2290,7 @@
}
],
"query": "1m,3m,5m,10m,15m",
+ "skipUrlSync": false,
"type": "custom"
}
]
@@ -3291,6 +2327,6 @@
"timezone": "browser",
"title": "Prometheus Performances",
"uid": null,
- "version": 2
+ "version": 3
}
{%- endraw %}
diff --git a/prometheus/files/grafana_dashboards/server/2.0/prometheus_stats_prometheus.json b/prometheus/files/grafana_dashboards/server/2.0/prometheus_stats_prometheus.json
index edaefe7..9ccb8ac 100644
--- a/prometheus/files/grafana_dashboards/server/2.0/prometheus_stats_prometheus.json
+++ b/prometheus/files/grafana_dashboards/server/2.0/prometheus_stats_prometheus.json
@@ -4,7 +4,7 @@
"list": [
{
"builtIn": 1,
- "datasource": "prometheus",
+ "datasource": null,
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
@@ -18,7 +18,7 @@
"gnetId": null,
"graphTooltip": 0,
"id": null,
- "iteration": 1529933876190,
+ "iteration": 1544617840863,
"links": [],
"panels": [
{
@@ -57,7 +57,7 @@
},
"gridPos": {
"h": 3,
- "w": 8,
+ "w": 4,
"x": 0,
"y": 1
},
@@ -92,13 +92,6 @@
],
"repeat": "instance",
"repeatDirection": "h",
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.13",
- "value": "10.0.0.13"
- }
- },
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
@@ -108,227 +101,16 @@
"tableColumn": "",
"targets": [
{
- "expr": "up{job=\"prometheus\",instance=~\"$instance:[1-9][0-9]*\"}",
+ "expr": "up{job=~\"prometheus|prometheus_lts\",instance=~\"$instance:[1-9][0-9]*\"}",
"format": "time_series",
"intervalFactor": 2,
+ "legendFormat": "",
"refId": "A",
"step": 40
}
],
"thresholds": "1,1",
- "title": "Prometheus@${instance}",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- },
- {
- "op": "=",
- "text": "FAIL",
- "value": "0"
- },
- {
- "op": "=",
- "text": "OK",
- "value": "1"
- }
- ],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": true,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "#299c46"
- ],
- "datasource": null,
- "decimals": null,
- "editable": true,
- "error": false,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 8,
- "x": 8,
- "y": 1
- },
- "id": 28,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "minSpan": 3,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "repeat": null,
- "repeatDirection": "h",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 5,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.8",
- "value": "10.0.0.8"
- }
- },
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": false
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "up{job=\"prometheus\",instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "refId": "A",
- "step": 40
- }
- ],
- "thresholds": "1,1",
- "title": "Prometheus@${instance}",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- },
- {
- "op": "=",
- "text": "FAIL",
- "value": "0"
- },
- {
- "op": "=",
- "text": "OK",
- "value": "1"
- }
- ],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": true,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "#299c46"
- ],
- "datasource": null,
- "decimals": null,
- "editable": true,
- "error": false,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 8,
- "x": 16,
- "y": 1
- },
- "id": 29,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "minSpan": 3,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "repeat": null,
- "repeatDirection": "h",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 5,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "127.0.0.1",
- "value": "127.0.0.1"
- }
- },
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": false
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "up{job=\"prometheus\",instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "refId": "A",
- "step": 40
- }
- ],
- "thresholds": "1,1",
- "title": "Prometheus@${instance}",
+ "title": "${instance}",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
@@ -372,7 +154,7 @@
},
"gridPos": {
"h": 3,
- "w": 8,
+ "w": 4,
"x": 0,
"y": 4
},
@@ -407,213 +189,6 @@
],
"repeat": "instance",
"repeatDirection": "h",
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.13",
- "value": "10.0.0.13"
- }
- },
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": false
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "prometheus_config_last_reload_successful{instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "refId": "A",
- "step": 40
- }
- ],
- "thresholds": "0:1",
- "title": "Config Reload@${instance}",
- "type": "singlestat",
- "valueFontSize": "70%",
- "valueMaps": [
- {
- "op": "=",
- "text": "Failure",
- "value": "0"
- },
- {
- "op": "=",
- "text": "Success",
- "value": "1"
- }
- ],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": true,
- "colors": [
- "#299c46",
- "rgba(237, 129, 40, 0.89)",
- "rgba(245, 54, 54, 0.9)"
- ],
- "datasource": null,
- "editable": true,
- "error": false,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 8,
- "x": 8,
- "y": 4
- },
- "id": 30,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "minSpan": 4,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "repeat": null,
- "repeatDirection": "h",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 16,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.8",
- "value": "10.0.0.8"
- }
- },
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": false
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "prometheus_config_last_reload_successful{instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "refId": "A",
- "step": 40
- }
- ],
- "thresholds": "0:1",
- "title": "Config Reload@${instance}",
- "type": "singlestat",
- "valueFontSize": "70%",
- "valueMaps": [
- {
- "op": "=",
- "text": "Failure",
- "value": "0"
- },
- {
- "op": "=",
- "text": "Success",
- "value": "1"
- }
- ],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": true,
- "colors": [
- "#299c46",
- "rgba(237, 129, 40, 0.89)",
- "rgba(245, 54, 54, 0.9)"
- ],
- "datasource": null,
- "editable": true,
- "error": false,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 8,
- "x": 16,
- "y": 4
- },
- "id": 31,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "minSpan": 4,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "repeat": null,
- "repeatDirection": "h",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 16,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "127.0.0.1",
- "value": "127.0.0.1"
- }
- },
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
@@ -720,13 +295,6 @@
],
"repeat": "instance",
"repeatDirection": "v",
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.13",
- "value": "10.0.0.13"
- }
- },
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
@@ -736,7 +304,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "(time() - process_start_time_seconds{job=\"prometheus\", instance=~\"$instance:[1-9][0-9]*\"})",
+ "expr": "(time() - process_start_time_seconds{job=~\"prometheus|prometheus_lts\", instance=~\"$instance:[1-9][0-9]*\"})",
"format": "time_series",
"intervalFactor": 2,
"refId": "A",
@@ -813,13 +381,6 @@
],
"repeat": "instance",
"repeatDirection": "v",
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.13",
- "value": "10.0.0.13"
- }
- },
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
@@ -900,575 +461,6 @@
],
"repeat": "instance",
"repeatDirection": "v",
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.13",
- "value": "10.0.0.13"
- }
- },
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "sum(prometheus_tsdb_head_chunks{instance=~\"$instance:[1-9][0-9]*\"})",
- "format": "time_series",
- "intervalFactor": 2,
- "refId": "A",
- "step": 40
- }
- ],
- "thresholds": "500,4000",
- "title": "Memory Chunks@${instance}",
- "type": "singlestat",
- "valueFontSize": "70%",
- "valueMaps": [
- {
- "op": "=",
- "text": "Empty",
- "value": "0"
- }
- ],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "datasource": null,
- "decimals": 1,
- "description": "",
- "editable": true,
- "error": false,
- "format": "s",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 8,
- "x": 0,
- "y": 11
- },
- "id": 32,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "minSpan": 4,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 23,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.8",
- "value": "10.0.0.8"
- }
- },
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": false
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "(time() - process_start_time_seconds{job=\"prometheus\", instance=~\"$instance:[1-9][0-9]*\"})",
- "format": "time_series",
- "intervalFactor": 2,
- "refId": "A",
- "step": 40
- }
- ],
- "thresholds": "",
- "title": "Uptime@${instance}",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(50, 172, 45, 0.97)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(245, 54, 54, 0.9)"
- ],
- "datasource": null,
- "editable": true,
- "error": false,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 8,
- "x": 8,
- "y": 11
- },
- "id": 34,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "minSpan": 4,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 6,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.8",
- "value": "10.0.0.8"
- }
- },
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "prometheus_tsdb_head_series{instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "refId": "A",
- "step": 40
- }
- ],
- "thresholds": "1,5",
- "title": "Total Series@${instance}",
- "type": "singlestat",
- "valueFontSize": "70%",
- "valueMaps": [],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(50, 172, 45, 0.97)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(245, 54, 54, 0.9)"
- ],
- "datasource": null,
- "editable": true,
- "error": false,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 8,
- "x": 16,
- "y": 11
- },
- "id": 36,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "minSpan": 4,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 7,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.8",
- "value": "10.0.0.8"
- }
- },
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "sum(prometheus_tsdb_head_chunks{instance=~\"$instance:[1-9][0-9]*\"})",
- "format": "time_series",
- "intervalFactor": 2,
- "refId": "A",
- "step": 40
- }
- ],
- "thresholds": "500,4000",
- "title": "Memory Chunks@${instance}",
- "type": "singlestat",
- "valueFontSize": "70%",
- "valueMaps": [
- {
- "op": "=",
- "text": "Empty",
- "value": "0"
- }
- ],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "datasource": null,
- "decimals": 1,
- "description": "",
- "editable": true,
- "error": false,
- "format": "s",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 8,
- "x": 0,
- "y": 14
- },
- "id": 33,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "minSpan": 4,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 23,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "127.0.0.1",
- "value": "127.0.0.1"
- }
- },
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": false
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "(time() - process_start_time_seconds{job=\"prometheus\", instance=~\"$instance:[1-9][0-9]*\"})",
- "format": "time_series",
- "intervalFactor": 2,
- "refId": "A",
- "step": 40
- }
- ],
- "thresholds": "",
- "title": "Uptime@${instance}",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(50, 172, 45, 0.97)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(245, 54, 54, 0.9)"
- ],
- "datasource": null,
- "editable": true,
- "error": false,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 8,
- "x": 8,
- "y": 14
- },
- "id": 35,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "minSpan": 4,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 6,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "127.0.0.1",
- "value": "127.0.0.1"
- }
- },
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "prometheus_tsdb_head_series{instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "intervalFactor": 2,
- "refId": "A",
- "step": 40
- }
- ],
- "thresholds": "1,5",
- "title": "Total Series@${instance}",
- "type": "singlestat",
- "valueFontSize": "70%",
- "valueMaps": [],
- "valueName": "current"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(50, 172, 45, 0.97)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(245, 54, 54, 0.9)"
- ],
- "datasource": null,
- "editable": true,
- "error": false,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 8,
- "x": 16,
- "y": 14
- },
- "id": 37,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "minSpan": 4,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 7,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "127.0.0.1",
- "value": "127.0.0.1"
- }
- },
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
@@ -1504,7 +496,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 17
+ "y": 11
},
"id": 25,
"panels": [],
@@ -1529,7 +521,7 @@
"h": 7,
"w": 24,
"x": 0,
- "y": 18
+ "y": 12
},
"id": 3,
"legend": {
@@ -1626,7 +618,7 @@
"h": 7,
"w": 12,
"x": 0,
- "y": 25
+ "y": 19
},
"id": 17,
"legend": {
@@ -1637,6 +629,8 @@
"min": false,
"rightSide": true,
"show": true,
+ "sort": "current",
+ "sortDesc": true,
"total": false,
"values": false
},
@@ -1651,21 +645,15 @@
"renderer": "flot",
"repeat": "instance",
"repeatDirection": "v",
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.13",
- "value": "10.0.0.13"
- }
- },
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
- "expr": "rate(http_request_duration_microseconds_count{handler=~\"query|query_range\",instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
+ "expr": "rate(prometheus_http_request_duration_seconds_count{handler=~\"/(query|query_range)\",instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
"format": "time_series",
+ "hide": false,
"intervalFactor": 2,
"legendFormat": "{{ handler }}",
"refId": "A",
@@ -1679,8 +667,8 @@
"tooltip": {
"msResolution": false,
"shared": true,
- "sort": 0,
- "value_type": "cumulative"
+ "sort": 1,
+ "value_type": "individual"
},
"type": "graph",
"xaxis": {
@@ -1692,7 +680,7 @@
},
"yaxes": [
{
- "format": "ms",
+ "format": "s",
"label": "",
"logBase": 1,
"max": null,
@@ -1724,7 +712,7 @@
"h": 7,
"w": 12,
"x": 12,
- "y": 25
+ "y": 19
},
"id": 18,
"legend": {
@@ -1749,433 +737,6 @@
"renderer": "flot",
"repeat": "instance",
"repeatDirection": "v",
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.13",
- "value": "10.0.0.13"
- }
- },
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "increase(prometheus_tsdb_head_series_created_total{instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "created",
- "refId": "A",
- "step": 4
- },
- {
- "expr": "increase(prometheus_tsdb_head_series_removed_total{instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "removed",
- "refId": "B",
- "step": 4
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Series@${instance}",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "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
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {},
- "gridPos": {
- "h": 7,
- "w": 12,
- "x": 0,
- "y": 32
- },
- "id": 38,
- "legend": {
- "alignAsTable": true,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "minSpan": 1,
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 17,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.8",
- "value": "10.0.0.8"
- }
- },
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "rate(http_request_duration_microseconds_count{handler=~\"query|query_range\",instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "{{ handler }}",
- "refId": "A",
- "step": 2
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Queries duration@${instance}",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "ms",
- "label": "",
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": false
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "fill": 1,
- "gridPos": {
- "h": 7,
- "w": 12,
- "x": 12,
- "y": 32
- },
- "id": 40,
- "legend": {
- "alignAsTable": true,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "minSpan": 2,
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 18,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.8",
- "value": "10.0.0.8"
- }
- },
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "increase(prometheus_tsdb_head_series_created_total{instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "created",
- "refId": "A",
- "step": 4
- },
- {
- "expr": "increase(prometheus_tsdb_head_series_removed_total{instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "removed",
- "refId": "B",
- "step": 4
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Series@${instance}",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "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
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {},
- "gridPos": {
- "h": 7,
- "w": 12,
- "x": 0,
- "y": 39
- },
- "id": 39,
- "legend": {
- "alignAsTable": true,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "minSpan": 1,
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 17,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "127.0.0.1",
- "value": "127.0.0.1"
- }
- },
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "rate(http_request_duration_microseconds_count{handler=~\"query|query_range\",instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "{{ handler }}",
- "refId": "A",
- "step": 2
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Queries duration@${instance}",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "ms",
- "label": "",
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": false
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "fill": 1,
- "gridPos": {
- "h": 7,
- "w": 12,
- "x": 12,
- "y": 39
- },
- "id": 41,
- "legend": {
- "alignAsTable": true,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "minSpan": 2,
- "nullPointMode": "null",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 18,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "127.0.0.1",
- "value": "127.0.0.1"
- }
- },
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
@@ -2244,7 +805,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 46
+ "y": 26
},
"id": 27,
"panels": [],
@@ -2268,7 +829,7 @@
"h": 7,
"w": 12,
"x": 0,
- "y": 47
+ "y": 27
},
"id": 2,
"legend": {
@@ -2293,13 +854,6 @@
"renderer": "flot",
"repeat": "instance",
"repeatDirection": "v",
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.13",
- "value": "10.0.0.13"
- }
- },
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
@@ -2369,7 +923,7 @@
"h": 7,
"w": 12,
"x": 12,
- "y": 47
+ "y": 27
},
"id": 14,
"legend": {
@@ -2394,433 +948,6 @@
"renderer": "flot",
"repeat": "instance",
"repeatDirection": "v",
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.13",
- "value": "10.0.0.13"
- }
- },
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "prometheus_target_interval_length_seconds{quantile!=\"0.01\", quantile!=\"0.05\", instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "interval": "",
- "intervalFactor": 2,
- "legendFormat": "{{ quantile }} ({{ interval }})",
- "metric": "",
- "refId": "A",
- "step": 4
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Scrape duration@${instance}",
- "tooltip": {
- "msResolution": false,
- "ordering": "alphabetical",
- "shared": true,
- "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
- }
- },
- {
- "aliasColors": {
- "prometheus": "#F9BA8F",
- "{instance=\"localhost:9090\",interval=\"5s\",job=\"prometheus\"}": "#F9BA8F"
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {},
- "gridPos": {
- "h": 7,
- "w": 12,
- "x": 0,
- "y": 54
- },
- "id": 42,
- "legend": {
- "alignAsTable": true,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "minSpan": 2,
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 2,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.8",
- "value": "10.0.0.8"
- }
- },
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "rate(prometheus_target_interval_length_seconds_count{instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "{{ instance }}",
- "refId": "A",
- "step": 4
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Target scrapes@${instance}",
- "tooltip": {
- "msResolution": false,
- "ordering": "alphabetical",
- "shared": true,
- "sort": 0,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "short",
- "label": "Scrapes / Second",
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {},
- "gridPos": {
- "h": 7,
- "w": 12,
- "x": 12,
- "y": 54
- },
- "id": 44,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "minSpan": 2,
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 14,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "10.0.0.8",
- "value": "10.0.0.8"
- }
- },
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "prometheus_target_interval_length_seconds{quantile!=\"0.01\", quantile!=\"0.05\", instance=~\"$instance:[1-9][0-9]*\"}",
- "format": "time_series",
- "interval": "",
- "intervalFactor": 2,
- "legendFormat": "{{ quantile }} ({{ interval }})",
- "metric": "",
- "refId": "A",
- "step": 4
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Scrape duration@${instance}",
- "tooltip": {
- "msResolution": false,
- "ordering": "alphabetical",
- "shared": true,
- "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
- }
- },
- {
- "aliasColors": {
- "prometheus": "#F9BA8F",
- "{instance=\"localhost:9090\",interval=\"5s\",job=\"prometheus\"}": "#F9BA8F"
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {},
- "gridPos": {
- "h": 7,
- "w": 12,
- "x": 0,
- "y": 61
- },
- "id": 43,
- "legend": {
- "alignAsTable": true,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "minSpan": 2,
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 2,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "127.0.0.1",
- "value": "127.0.0.1"
- }
- },
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "rate(prometheus_target_interval_length_seconds_count{instance=~\"$instance:[1-9][0-9]*\"}[$rate_interval])",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "{{ instance }}",
- "refId": "A",
- "step": 4
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Target scrapes@${instance}",
- "tooltip": {
- "msResolution": false,
- "ordering": "alphabetical",
- "shared": true,
- "sort": 0,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "short",
- "label": "Scrapes / Second",
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {},
- "gridPos": {
- "h": 7,
- "w": 12,
- "x": 12,
- "y": 61
- },
- "id": 45,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 1,
- "links": [],
- "minSpan": 2,
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "v",
- "repeatIteration": 1529933876190,
- "repeatPanelId": 14,
- "scopedVars": {
- "instance": {
- "selected": false,
- "text": "127.0.0.1",
- "value": "127.0.0.1"
- }
- },
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
@@ -2888,13 +1015,7 @@
"list": [
{
"allValue": null,
- "current": {
- "tags": [],
- "text": "All",
- "value": [
- "$__all"
- ]
- },
+ "current": {},
"datasource": null,
"hide": 0,
"includeAll": true,
@@ -2902,9 +1023,10 @@
"multi": true,
"name": "instance",
"options": [],
- "query": "query_result(up{job=\"prometheus\"} == 1)",
+ "query": "query_result(up{job=~\"prometheus|prometheus_lts\"})",
"refresh": 1,
"regex": ".*instance=\"([^:]+):[1-9][0-9]*\".*",
+ "skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
@@ -2957,6 +1079,7 @@
}
],
"query": "1m,3m,5m,10m,15m",
+ "skipUrlSync": false,
"type": "custom"
}
]
@@ -2995,6 +1118,6 @@
"timezone": "browser",
"title": "Prometheus Stats",
"uid": null,
- "version": 2
+ "version": 5
}
{%- endraw %}
diff --git a/prometheus/files/server/prometheus.yml b/prometheus/files/server/prometheus.yml
index 4bc011c..87a6fd0 100644
--- a/prometheus/files/server/prometheus.yml
+++ b/prometheus/files/server/prometheus.yml
@@ -197,11 +197,17 @@
{%- endfor %}
{%- set kubernetes_target = {} %}
+{%- set kubernetes_apiservers = {} %}
{%- if server.get('use_grains', {}).get('target', True) %}
{%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
{%- set kubernetes_grain = node_grains.get('prometheus', {}).get('server', {}).get('target', {}).get('kubernetes', {}) %}
{%- if kubernetes_grain %}
{%- do kubernetes_target.update(kubernetes_grain) %}
+ {%- set api_server_endpoint = kubernetes_grain.get('api_server_endpoint') %}
+ {%- if api_server_endpoint %}
+ {%- set host = node_name.split(".")[0] %}
+ {%- do kubernetes_apiservers.update({host: {'endpoint': api_server_endpoint}}) %}
+ {%- endif %}
{%- endif %}
{%- endfor %}
{%- endif %}
@@ -230,7 +236,12 @@
- source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name]
action: keep
regex: default;kubernetes;https
-
+ {%- for node, node_params in kubernetes_apiservers.iteritems() %}
+ - source_labels: ['__address__']
+ regex: {{ node_params.endpoint }}
+ replacement: {{ node }}
+ target_label: "host"
+ {%- endfor %}
- job_name: 'kubernetes-node'
scheme: https
tls_config:
diff --git a/prometheus/gainsight.sls b/prometheus/gainsight.sls
index 4862c3b..7f61fe9 100644
--- a/prometheus/gainsight.sls
+++ b/prometheus/gainsight.sls
@@ -11,6 +11,10 @@
file.directory:
- makedirs: True
+{{gainsight.dir.csv}}:
+ file.directory:
+ - makedirs: True
+
{{gainsight.dir.config}}/config.ini:
file.managed:
- source: salt://prometheus/files/gainsight/gainsight_config.yml
diff --git a/prometheus/gainsight_elasticsearch.sls b/prometheus/gainsight_elasticsearch.sls
index 3ca5c39..38ca01d 100644
--- a/prometheus/gainsight_elasticsearch.sls
+++ b/prometheus/gainsight_elasticsearch.sls
@@ -11,6 +11,10 @@
file.directory:
- makedirs: True
+{{gainsight_elasticsearch.dir.csv}}:
+ file.directory:
+ - makedirs: True
+
{{gainsight_elasticsearch.dir.config}}/config.ini:
file.managed:
- source: salt://prometheus/files/gainsight/gainsight_elasticsearch_config.yml