diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 9137b9d2ac66775a6de0aa0c5279b69e26488eae..203e4b30ff0bdb58243d7e7c5c5ab30b1fbb9286 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -38,8 +38,8 @@ "subdir": "grafana-builder" } }, - "version": "c4975f7c4a7ab4c21020c4afbf247aa49142174d", - "sum": "y8uA/daOROErelzoo2p1rtqABhUPArg2alsfcb0PQBk=" + "version": "84900d9dc450116ad66864f48088f92ccae36c54", + "sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc=" }, { "source": { @@ -48,8 +48,8 @@ "subdir": "" } }, - "version": "cca0b525fa42081074c3950972e3c6afdbc61696", - "sum": "0mIIqZiIqurJ1Eekmx/flmb9C/S7lePrtN/qGve/Emc=" + "version": "ee732bc30e1a5bc8b45e436508b7685bb1109a28", + "sum": "TCe4Sctkv+i5/UzDy10Vda5s1Slt6EGzEES9Mi5kTko=" }, { "source": { @@ -58,7 +58,7 @@ "subdir": "lib/promgrafonnet" } }, - "version": "cca0b525fa42081074c3950972e3c6afdbc61696", + "version": "ee732bc30e1a5bc8b45e436508b7685bb1109a28", "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps=" }, { @@ -88,7 +88,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "e639f1c83e4c8971e2e88ce530ff7fde72098884", + "version": "787f54b055f797464d5832ace1c7f8318321c87a", "sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=", "name": "prometheus-operator-mixin" }, @@ -99,8 +99,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "e639f1c83e4c8971e2e88ce530ff7fde72098884", - "sum": "AYICIHiqYYszo3HJQWBfoCotUh9BLyqrVuBkWP7+rlc=" + "version": "787f54b055f797464d5832ace1c7f8318321c87a", + "sum": "T1NSdVUDjEfANyLi73zS8+ysAXMmoRLObI6vsCnDAJQ=" }, { "source": { @@ -130,7 +130,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "ddaddc2a7af235d91b710bcba1ccbec4e7cfa6b5", + "version": "0e82a96e2f2ecb0110cdfad014aaa6babf4f4941", "sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=", "name": "prometheus" }, @@ -141,7 +141,7 @@ "subdir": "mixin" } }, - "version": "d5194a473c418bfc0c531d0f2cf85fb9681cc998", + "version": "78391ded0f4821f650ed2c4f097b505f4fa30713", "sum": "1Y1cPIeoPg2nCAEhKPCt8bAGuwuOP2eZ3kVF432mlMA=", "name": "thanos-mixin" }, diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index 14cff66154571b32bd7247dfd60e800c68c5c90a..0639fce556b678ff5ef37c571f66524a405ee951 100644 --- a/manifests/grafana-dashboardDefinitions.yaml +++ b/manifests/grafana-dashboardDefinitions.yaml @@ -16635,11 +16635,11 @@ items: "includeAll": false, "label": null, "multi": false, - "name": "workload", + "name": "type", "options": [ ], - "query": "label_values(namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\"}, workload)", + "query": "label_values(namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\"}, workload_type)", "refresh": 2, "regex": "", "sort": 1, @@ -16662,11 +16662,11 @@ items: "includeAll": false, "label": null, "multi": false, - "name": "type", + "name": "workload", "options": [ ], - "query": "label_values(namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload=\"$workload\"}, workload_type)", + "query": "label_values(namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}, workload)", "refresh": 2, "regex": "", "sort": 1, diff --git a/manifests/setup/prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml index 3ce52e501f4c643a32c0df162c92687bc3ae1034..aeea6c161e5c8a6c9718474f4dbc30fd0754078d 100644 --- a/manifests/setup/prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml +++ b/manifests/setup/prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml @@ -1053,6 +1053,43 @@ spec: type: string type: object type: object + pagerDutyImageConfigs: + description: A list of image details to attach that provide + further detail about an incident. + items: + description: PagerDutyImageConfig attaches images to + an incident + properties: + alt: + description: Alt is the optional alternative text + for the image. + type: string + href: + description: Optional URL; makes the image a clickable + link. + type: string + src: + description: Src of the image being attached to + the incident + type: string + type: object + type: array + pagerDutyLinkConfigs: + description: A list of link details to attach that provide + further detail about an incident. + items: + description: PagerDutyLinkConfig attaches text links + to an incident + properties: + alt: + description: Text that describes the purpose of + the link, and can be used as the link's text. + type: string + href: + description: Href is the URL of the link to be attached + type: string + type: object + type: array routingKey: description: The secret's key that contains the PagerDuty integration key (when using Events API v2). Either this