Skip to content

Commit 488dcce

Browse files
authored
Revert caddy changes (#1196)
* Revert caddy changes * fix fmt
1 parent cee0123 commit 488dcce

File tree

1 file changed

+3
-35
lines changed

1 file changed

+3
-35
lines changed

caddy-mixin/dashboards/caddy-overview.jsonnet

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
local matcher = 'job=~"$job", server=~"$service", instance=~"$instance"',
2+
local matcher = 'job=~"$job", instance=~"$instance"',
33
annotations: {
44
list: [
55
{
@@ -714,39 +714,7 @@
714714
datasource: {
715715
uid: '$datasource',
716716
},
717-
definition: "label_values(caddy_http_requests_total{job=~\"'$job'\"} server)",
718-
hide: 0,
719-
includeAll: true,
720-
label: 'service',
721-
multi: true,
722-
name: 'service',
723-
options: [],
724-
query: {
725-
qryType: 1,
726-
query: "label_values(caddy_http_requests_total{job=~\"'$job'\"}, server)",
727-
refId: 'PrometheusVariableQueryEditor-VariableQuery',
728-
},
729-
refresh: 2,
730-
regex: '',
731-
skipUrlSync: false,
732-
sort: 1,
733-
tagValuesQuery: '',
734-
tags: [],
735-
tagsQuery: '',
736-
type: 'query',
737-
useTags: false,
738-
},
739-
{
740-
allValue: '.+',
741-
current: {
742-
selected: false,
743-
text: 'All',
744-
value: '$__all',
745-
},
746-
datasource: {
747-
uid: '$datasource',
748-
},
749-
definition: "label_values(caddy_http_requests_total{job=~\"'$job'\", server=~\"$service\"}, instance)",
717+
definition: 'label_values(caddy_http_requests_total{job=~"$job"}, instance)',
750718
hide: 0,
751719
includeAll: true,
752720
label: 'Instance',
@@ -755,7 +723,7 @@
755723
options: [],
756724
query: {
757725
qryType: 1,
758-
query: "label_values(caddy_http_requests_total{job=~\"'$job'\", server=~\"$service\"}, instance)",
726+
query: 'label_values(caddy_http_requests_total{job=~"$job"}, instance)',
759727
refId: 'PrometheusVariableQueryEditor-VariableQuery',
760728
},
761729
refresh: 2,

0 commit comments

Comments
 (0)