diff --git a/assets/aerospike/dashboards/aerospike-logs.json b/assets/aerospike/dashboards/aerospike-logs.json index 625f739..a9c54db 100644 --- a/assets/aerospike/dashboards/aerospike-logs.json +++ b/assets/aerospike/dashboards/aerospike-logs.json @@ -161,7 +161,7 @@ "type": "loki", "uid": "${loki_datasource}" }, - "expr": "sum by (level) (count_over_time({job=~\"integrations/aerospike\",job=~\"$job\",aerospike_cluster=~\"$aerospike_cluster\",instance=~\"$instance\",context=~\"$context\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__interval]))\n", + "expr": "sum by (level) (count_over_time({job=~\"integrations/aerospike\",job=~\"$job\",aerospike_cluster=~\"$aerospike_cluster\",instance=~\"$instance\",context=~\"$context\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__auto]))\n", "legendFormat": "{{ level }}" } ], diff --git a/assets/apache-activemq/dashboards/apache-activemq-logs.json b/assets/apache-activemq/dashboards/apache-activemq-logs.json index 2c85cca..c57d7fe 100644 --- a/assets/apache-activemq/dashboards/apache-activemq-logs.json +++ b/assets/apache-activemq/dashboards/apache-activemq-logs.json @@ -161,7 +161,7 @@ "type": "loki", "uid": "${loki_datasource}" }, - "expr": "sum by (level) (count_over_time({job=~\"integrations/apache-activemq\",job=~\"$job\",activemq_cluster=~\"$activemq_cluster\",instance=~\"$instance\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__interval]))\n", + "expr": "sum by (level) (count_over_time({job=~\"integrations/apache-activemq\",job=~\"$job\",activemq_cluster=~\"$activemq_cluster\",instance=~\"$instance\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__auto]))\n", "legendFormat": "{{ level }}" } ], diff --git a/assets/apache-hbase/dashboards/apache-hbase-logs.json b/assets/apache-hbase/dashboards/apache-hbase-logs.json index defd711..e078ce2 100644 --- a/assets/apache-hbase/dashboards/apache-hbase-logs.json +++ b/assets/apache-hbase/dashboards/apache-hbase-logs.json @@ -161,7 +161,7 @@ "type": "loki", "uid": "${loki_datasource}" }, - "expr": "sum by (level) (count_over_time({job=~\"integrations/apache-hbase\",job=~\"$job\",hbase_cluster=~\"$hbase_cluster\",instance=~\"$instance\",logger=~\"$logger\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__interval]))\n", + "expr": "sum by (level) (count_over_time({job=~\"integrations/apache-hbase\",job=~\"$job\",hbase_cluster=~\"$hbase_cluster\",instance=~\"$instance\",logger=~\"$logger\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__auto]))\n", "legendFormat": "{{ level }}" } ], diff --git a/assets/apache-solr/dashboards/apache-solr-logs-overview.json b/assets/apache-solr/dashboards/apache-solr-logs-overview.json index 71f0479..f634a35 100644 --- a/assets/apache-solr/dashboards/apache-solr-logs-overview.json +++ b/assets/apache-solr/dashboards/apache-solr-logs-overview.json @@ -161,7 +161,7 @@ "type": "loki", "uid": "${loki_datasource}" }, - "expr": "sum by (level) (count_over_time({job=~\"integrations/apache-solr\",job=~\"$job\",solr_cluster=~\"$solr_cluster\",instance=~\"$instance\",level=~\"$level\",filename=~\"$filename\"}\n|~ \"$regex_search\"\n\n[$__interval]))\n", + "expr": "sum by (level) (count_over_time({job=~\"integrations/apache-solr\",job=~\"$job\",solr_cluster=~\"$solr_cluster\",instance=~\"$instance\",level=~\"$level\",filename=~\"$filename\"}\n|~ \"$regex_search\"\n\n[$__auto]))\n", "legendFormat": "{{ level }}" } ], diff --git a/assets/clickhouse/dashboards/clickhouse-logs.json b/assets/clickhouse/dashboards/clickhouse-logs.json index 9cbc7c4..4c5e716 100644 --- a/assets/clickhouse/dashboards/clickhouse-logs.json +++ b/assets/clickhouse/dashboards/clickhouse-logs.json @@ -161,7 +161,7 @@ "type": "loki", "uid": "${loki_datasource}" }, - "expr": "sum by (level) (count_over_time({job=~\".*/clickhouse.*\",job=~\"$job\",instance=~\"$instance\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__interval]))\n", + "expr": "sum by (level) (count_over_time({job=~\".*/clickhouse.*\",job=~\"$job\",instance=~\"$instance\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__auto]))\n", "legendFormat": "{{ level }}" } ], diff --git a/assets/influxdb/dashboards/influxdb-logs.json b/assets/influxdb/dashboards/influxdb-logs.json index 477c6dc..83fa413 100644 --- a/assets/influxdb/dashboards/influxdb-logs.json +++ b/assets/influxdb/dashboards/influxdb-logs.json @@ -161,7 +161,7 @@ "type": "loki", "uid": "${loki_datasource}" }, - "expr": "sum by (level) (count_over_time({job=~\"integrations/influxdb\",job=~\"$job\",influxdb_cluster=~\"$influxdb_cluster\",instance=~\"$instance\",level=~\"$level\",service=~\"$service\",engine=~\"$engine\"}\n|~ \"$regex_search\"\n\n[$__interval]))\n", + "expr": "sum by (level) (count_over_time({job=~\"integrations/influxdb\",job=~\"$job\",influxdb_cluster=~\"$influxdb_cluster\",instance=~\"$instance\",level=~\"$level\",service=~\"$service\",engine=~\"$engine\"}\n|~ \"$regex_search\"\n\n[$__auto]))\n", "legendFormat": "{{ level }}" } ], diff --git a/assets/istio/dashboards/logs b/assets/istio/dashboards/logs index 7a244e7..052eda5 100644 --- a/assets/istio/dashboards/logs +++ b/assets/istio/dashboards/logs @@ -166,7 +166,7 @@ "type": "loki", "uid": "${loki_datasource}" }, - "expr": "sum by (response_code) (count_over_time({job=~\"integrations/istio\",job=~\"$job\",cluster=~\"$cluster\",pod=~\"$pod\",log_type=~\"$log_type\",protocol=~\"$protocol\",request_method=~\"$request_method\",response_code=~\"$response_code\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__interval]))\n", + "expr": "sum by (response_code) (count_over_time({job=~\"integrations/istio\",job=~\"$job\",cluster=~\"$cluster\",pod=~\"$pod\",log_type=~\"$log_type\",protocol=~\"$protocol\",request_method=~\"$request_method\",response_code=~\"$response_code\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__auto]))\n", "legendFormat": "{{ response_code }}" } ], diff --git a/assets/openldap/dashboards/logs b/assets/openldap/dashboards/logs index 36676a0..ba212d0 100644 --- a/assets/openldap/dashboards/logs +++ b/assets/openldap/dashboards/logs @@ -157,7 +157,7 @@ "type": "loki", "uid": "${loki_datasource}" }, - "expr": "sum by (level) (count_over_time({job=~\"integrations/openldap\",job=~\"$job\",instance=~\"$instance\",level=~\"$level\",component=~\"$component\"}\n|~ \"$regex_search\"\n\n[$__interval]))\n", + "expr": "sum by (level) (count_over_time({job=~\"integrations/openldap\",job=~\"$job\",instance=~\"$instance\",level=~\"$level\",component=~\"$component\"}\n|~ \"$regex_search\"\n\n[$__auto]))\n", "legendFormat": "{{ level }}" } ], diff --git a/assets/openstack/dashboards/logs b/assets/openstack/dashboards/logs index 3084267..4f70980 100644 --- a/assets/openstack/dashboards/logs +++ b/assets/openstack/dashboards/logs @@ -172,7 +172,7 @@ "type": "loki", "uid": "${loki_datasource}" }, - "expr": "sum by (level) (count_over_time({job=~\"integrations/openstack\",job=~\"$job\",level=~\"$level\",service=~\"$service\"}\n|~ \"$regex_search\"\n\n[$__interval]))\n", + "expr": "sum by (level) (count_over_time({job=~\"integrations/openstack\",job=~\"$job\",level=~\"$level\",service=~\"$service\"}\n|~ \"$regex_search\"\n\n[$__auto]))\n", "legendFormat": "{{ level }}" } ], diff --git a/assets/pgbouncer/dashboards/logs b/assets/pgbouncer/dashboards/logs index f61ac2f..7b1b2c8 100644 --- a/assets/pgbouncer/dashboards/logs +++ b/assets/pgbouncer/dashboards/logs @@ -160,7 +160,7 @@ "type": "loki", "uid": "${loki_datasource}" }, - "expr": "sum by (level) (count_over_time({job=~\"integrations/pgbouncer\",job=~\"$job\",pgbouncer_cluster=~\"$pgbouncer_cluster\",instance=~\"$instance\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__interval]))\n", + "expr": "sum by (level) (count_over_time({job=~\"integrations/pgbouncer\",job=~\"$job\",pgbouncer_cluster=~\"$pgbouncer_cluster\",instance=~\"$instance\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__auto]))\n", "legendFormat": "{{ level }}" } ], diff --git a/assets/presto/dashboards/presto-logs.json b/assets/presto/dashboards/presto-logs.json index 1721061..7ce4a2e 100644 --- a/assets/presto/dashboards/presto-logs.json +++ b/assets/presto/dashboards/presto-logs.json @@ -161,7 +161,7 @@ "type": "loki", "uid": "${loki_datasource}" }, - "expr": "sum by (level) (count_over_time({job=~\"integrations/presto\",job=~\"$job\",presto_cluster=~\"$presto_cluster\",instance=~\"$instance\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__interval]))\n", + "expr": "sum by (level) (count_over_time({job=~\"integrations/presto\",job=~\"$job\",presto_cluster=~\"$presto_cluster\",instance=~\"$instance\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__auto]))\n", "legendFormat": "{{ level }}" } ], diff --git a/assets/velero/dashboards/logs b/assets/velero/dashboards/logs index 6dfcdec..048eeb0 100644 --- a/assets/velero/dashboards/logs +++ b/assets/velero/dashboards/logs @@ -160,7 +160,7 @@ "type": "loki", "uid": "${loki_datasource}" }, - "expr": "sum by (level) (count_over_time({job=~\"integrations/velero\",job=~\"$job\",instance=~\"$instance\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__interval]))\n", + "expr": "sum by (level) (count_over_time({job=~\"integrations/velero\",job=~\"$job\",instance=~\"$instance\",level=~\"$level\"}\n|~ \"$regex_search\"\n\n[$__auto]))\n", "legendFormat": "{{ level }}" } ], diff --git a/assets/windows-active-directory/dashboards/activedirectory b/assets/windows-active-directory/dashboards/activedirectory index e4b4170..81ffd40 100644 --- a/assets/windows-active-directory/dashboards/activedirectory +++ b/assets/windows-active-directory/dashboards/activedirectory @@ -1099,7 +1099,7 @@ "templating": { "list": [ { - "label": "Prometheus datasource", + "label": "Prometheus data source", "name": "prometheus_datasource", "query": "prometheus", "regex": "", diff --git a/assets/windows-active-directory/dashboards/logs b/assets/windows-active-directory/dashboards/logs index aa7b2d8..091d683 100644 --- a/assets/windows-active-directory/dashboards/logs +++ b/assets/windows-active-directory/dashboards/logs @@ -204,7 +204,7 @@ "type": "loki", "uid": "${loki_datasource}" }, - "expr": "sum by (level) (count_over_time({job=~\".*windows.*\",job=~\"$job\",instance=~\"$instance\",channel=~\"$channel\",source=~\"$source\",keywords=~\"$keywords\",level=~\"$level\"}\n|~ \"$regex_search\"\n| json | __error__=``\n[$__interval]))\n", + "expr": "sum by (level) (count_over_time({job=~\".*windows.*\",job=~\"$job\",instance=~\"$instance\",channel=~\"$channel\",source=~\"$source\",keywords=~\"$keywords\",level=~\"$level\"}\n|~ \"$regex_search\"\n| json | __error__=``\n[$__auto]))\n", "legendFormat": "{{ level }}" } ], @@ -377,7 +377,7 @@ }, { "hide": 2, - "label": "Prometheus datasource", + "label": "Prometheus data source", "name": "prometheus_datasource", "query": "prometheus", "regex": "Prometheus|Cortex|Mimir|grafanacloud-.+-prom", diff --git a/assets/windows/dashboards/disks b/assets/windows/dashboards/disks index fea3522..90714b3 100644 --- a/assets/windows/dashboards/disks +++ b/assets/windows/dashboards/disks @@ -676,7 +676,7 @@ "templating": { "list": [ { - "label": "Prometheus datasource", + "label": "Prometheus data source", "name": "prometheus_datasource", "query": "prometheus", "regex": "Prometheus|Cortex|Mimir|grafanacloud-.+-prom", diff --git a/assets/windows/dashboards/fleet b/assets/windows/dashboards/fleet index be22723..46a6828 100644 --- a/assets/windows/dashboards/fleet +++ b/assets/windows/dashboards/fleet @@ -1072,7 +1072,7 @@ "templating": { "list": [ { - "label": "Prometheus datasource", + "label": "Prometheus data source", "name": "prometheus_datasource", "query": "prometheus", "regex": "Prometheus|Cortex|Mimir|grafanacloud-.+-prom", diff --git a/assets/windows/dashboards/logs b/assets/windows/dashboards/logs index 9eaa24f..b68abca 100644 --- a/assets/windows/dashboards/logs +++ b/assets/windows/dashboards/logs @@ -216,7 +216,7 @@ "type": "loki", "uid": "${loki_datasource}" }, - "expr": "sum by (level) (count_over_time({job=~\".*windows.*\",job=~\"$job\",instance=~\"$instance\",channel=~\"$channel\",source=~\"$source\",keywords=~\"$keywords\",level=~\"$level\"}\n|~ \"$regex_search\"\n| json | __error__=``\n[$__interval]))\n", + "expr": "sum by (level) (count_over_time({job=~\".*windows.*\",job=~\"$job\",instance=~\"$instance\",channel=~\"$channel\",source=~\"$source\",keywords=~\"$keywords\",level=~\"$level\"}\n|~ \"$regex_search\"\n| json | __error__=``\n[$__auto]))\n", "legendFormat": "{{ level }}" } ], @@ -389,7 +389,7 @@ }, { "hide": 2, - "label": "Prometheus datasource", + "label": "Prometheus data source", "name": "prometheus_datasource", "query": "prometheus", "regex": "Prometheus|Cortex|Mimir|grafanacloud-.+-prom", diff --git a/assets/windows/dashboards/overview b/assets/windows/dashboards/overview index b8902a9..0f4c11a 100644 --- a/assets/windows/dashboards/overview +++ b/assets/windows/dashboards/overview @@ -1230,7 +1230,7 @@ "templating": { "list": [ { - "label": "Prometheus datasource", + "label": "Prometheus data source", "name": "prometheus_datasource", "query": "prometheus", "regex": "Prometheus|Cortex|Mimir|grafanacloud-.+-prom", diff --git a/assets/windows/dashboards/system b/assets/windows/dashboards/system index b54ad37..20f4cae 100644 --- a/assets/windows/dashboards/system +++ b/assets/windows/dashboards/system @@ -583,7 +583,7 @@ "templating": { "list": [ { - "label": "Prometheus datasource", + "label": "Prometheus data source", "name": "prometheus_datasource", "query": "prometheus", "regex": "Prometheus|Cortex|Mimir|grafanacloud-.+-prom",