From 52928fd7d5dcebcec62e87b30346c319a190b33f Mon Sep 17 00:00:00 2001 From: Roboquat Date: Mon, 20 May 2024 00:13:51 +0000 Subject: [PATCH] [bot] [main] Automated dependencies update --- jsonnetfile.lock.json | 20 +- ...managerConfigCustomResourceDefinition.yaml | 2 +- ...0alertmanagerCustomResourceDefinition.yaml | 2 +- ...r-0podmonitorCustomResourceDefinition.yaml | 2 +- ...erator-0probeCustomResourceDefinition.yaml | 2 +- ...r-0prometheusCustomResourceDefinition.yaml | 116 +++++++++++- ...ometheusagentCustomResourceDefinition.yaml | 22 ++- ...rometheusruleCustomResourceDefinition.yaml | 2 +- ...0scrapeconfigCustomResourceDefinition.yaml | 2 +- ...ervicemonitorCustomResourceDefinition.yaml | 2 +- ...-0thanosrulerCustomResourceDefinition.yaml | 2 +- .../grafana/dashboardDefinitions.yaml | 97 ++++------ .../dashboards/gitpod-overview.json | 79 ++++---- .../grafana-builder/grafana.libsonnet | 171 ++---------------- .../alertmanagerconfigs-crd.json | 2 +- .../alertmanagers-crd.json | 2 +- .../prometheus-operator/podmonitors-crd.json | 2 +- .../prometheus-operator/probes-crd.json | 2 +- .../prometheusagents-crd.json | 19 +- .../prometheus-operator/prometheuses-crd.json | 88 ++++++++- .../prometheusrules-crd.json | 2 +- .../scrapeconfigs-crd.json | 2 +- .../servicemonitors-crd.json | 2 +- .../prometheus-operator/thanosrulers-crd.json | 2 +- 24 files changed, 338 insertions(+), 306 deletions(-) diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index a0b748cf..6be438bf 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "a2ce03538f2dc6a900aefdda606a431374ccd14b", + "version": "52fb28c1a8db4e66c547b7975bf6dc1e0b17f8bf", "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws=" }, { @@ -28,8 +28,8 @@ "subdir": "operations/observability/mixins" } }, - "version": "bcf779794174550cbe345b6a7493363771976489", - "sum": "ib+j6kKrmwubgOtDuKIwCD6CZxl0qK8O2ipn/HnXkv8=", + "version": "5fdedd96443f204b301e5e975a93e031fc478ef6", + "sum": "W/EJz6gxBgggO8qFOpHCjZ4oO754p3OwORr2Rx1LTUQ=", "name": "gitpod" }, { @@ -99,8 +99,8 @@ "subdir": "grafana-builder" } }, - "version": "60f98f603ffb2f88b360d9e31dafa5b0422914a7", - "sum": "5ku1Hd8UPnjmn8nWyaTFzMpT3Pa+VylBnmposMSVEuU=" + "version": "02db06f540086fa3f67d487bd01e1b314853fb8f", + "sum": "B49EzIY2WZsFxNMJcgRxE/gcZ9ltnS8pkOOV6Q5qioc=" }, { "source": { @@ -169,7 +169,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "f4b82d7235daee34f41ceb3e60210759c4733525", + "version": "cd506c4fb584f40b46163926f01ba24a91f5baf5", "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, @@ -180,8 +180,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "f4b82d7235daee34f41ceb3e60210759c4733525", - "sum": "2oKH6voUO/qmkU8oz0lFmM4IgICfJF4R4jSRxRMkPwk=" + "version": "cd506c4fb584f40b46163926f01ba24a91f5baf5", + "sum": "XahuGOJRU3s3I+V9/IT4zo43rlA35XiAN7mdfUF/BoA=" }, { "source": { @@ -211,7 +211,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "edf5ebd84422d1f894e7d56451cdf06fd16a83dc", + "version": "114dc5c393ce54ac663a2466a82571e1e0e0d03d", "sum": "vGD+MxGadIBvvDC+/71BRKWEA8vHgcuBP5PcuCKZGEs=", "name": "prometheus" }, @@ -233,7 +233,7 @@ "subdir": "mixin" } }, - "version": "9707a4f7da53efe0ca674c9e867c3936ead9ba2c", + "version": "9e6cbd9fdd9df17125e20ecf7a084198e4355b9a", "sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=", "name": "thanos-mixin" }, diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml index df6353f8..1110d55c 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.14.0 - operator.prometheus.io/version: 0.73.2 + operator.prometheus.io/version: 0.74.0 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml index 9e44a4c9..44abd21a 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.14.0 - operator.prometheus.io/version: 0.73.2 + operator.prometheus.io/version: 0.74.0 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml index 07308f9d..c5382e38 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.14.0 - operator.prometheus.io/version: 0.73.2 + operator.prometheus.io/version: 0.74.0 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml index 8d79565d..6ba6168b 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.14.0 - operator.prometheus.io/version: 0.73.2 + operator.prometheus.io/version: 0.74.0 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml index 2cfea62d..028b6244 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.14.0 - operator.prometheus.io/version: 0.73.2 + operator.prometheus.io/version: 0.74.0 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -1060,6 +1060,100 @@ spec: AlertmanagerEndpoints defines a selection of a single Endpoints object containing Alertmanager IPs to fire alerts against. properties: + alertRelabelings: + description: |- + Relabeling configs applied before sending alerts to a specific Alertmanager. + It requires Prometheus >= v2.51.0. + items: + description: |- + RelabelConfig allows dynamic rewriting of the label set for targets, alerts, + scraped samples and remote write samples. + + + More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config + properties: + action: + default: replace + description: |- + Action to perform based on the regex matching. + + + `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0. + `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0. + + + Default: "Replace" + enum: + - replace + - Replace + - keep + - Keep + - drop + - Drop + - hashmod + - HashMod + - labelmap + - LabelMap + - labeldrop + - LabelDrop + - labelkeep + - LabelKeep + - lowercase + - Lowercase + - uppercase + - Uppercase + - keepequal + - KeepEqual + - dropequal + - DropEqual + type: string + modulus: + description: |- + Modulus to take of the hash of the source label values. + + + Only applicable when the action is `HashMod`. + format: int64 + type: integer + regex: + description: Regular expression against which the extracted value is matched. + type: string + replacement: + description: |- + Replacement value against which a Replace action is performed if the + regular expression matches. + + + Regex capture groups are available. + type: string + separator: + description: Separator is the string between concatenated SourceLabels. + type: string + sourceLabels: + description: |- + The source labels select values from existing labels. Their content is + concatenated using the configured Separator and matched against the + configured regular expression. + items: + description: |- + LabelName is a valid Prometheus label name which may only contain ASCII + letters, numbers, as well as underscores. + pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + type: string + type: array + targetLabel: + description: |- + Label to which the resulting string is written in a replacement. + + + It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`, + `KeepEqual` and `DropEqual` actions. + + + Regex capture groups are available. + type: string + type: object + type: array apiVersion: description: |- Version of the Alertmanager API that Prometheus uses to send alerts. @@ -5588,7 +5682,7 @@ spec: managedIdentity: description: |- ManagedIdentity defines the Azure User-assigned Managed identity. - Cannot be set at the same time as `oauth`. + Cannot be set at the same time as `oauth` or `sdk`. properties: clientId: description: The client id @@ -5599,7 +5693,7 @@ spec: oauth: description: |- OAuth defines the oauth config that is being used to authenticate. - Cannot be set at the same time as `managedIdentity`. + Cannot be set at the same time as `managedIdentity` or `sdk`. It requires Prometheus >= v2.48.0. @@ -5628,7 +5722,7 @@ spec: type: object x-kubernetes-map-type: atomic tenantId: - description: '`tenantID` is the tenant ID of the Azure Active Directory application that is being used to authenticate.' + description: '`tenantId` is the tenant ID of the Azure Active Directory application that is being used to authenticate.' minLength: 1 pattern: ^[0-9a-zA-Z-.]+$ type: string @@ -5637,6 +5731,20 @@ spec: - clientSecret - tenantId type: object + sdk: + description: |- + SDK defines the Azure SDK config that is being used to authenticate. + See https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication + Cannot be set at the same time as `oauth` or `managedIdentity`. + + + It requires Prometheus >= 2.52.0. + properties: + tenantId: + description: '`tenantId` is the tenant ID of the azure active directory application that is being used to authenticate.' + pattern: ^[0-9a-zA-Z-.]+$ + type: string + type: object type: object basicAuth: description: |- diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml index f16ef4bf..3e9ac6b4 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - operator.prometheus.io/version: 0.73.2 + operator.prometheus.io/version: 0.74.0 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -4588,7 +4588,7 @@ spec: managedIdentity: description: |- ManagedIdentity defines the Azure User-assigned Managed identity. - Cannot be set at the same time as `oauth`. + Cannot be set at the same time as `oauth` or `sdk`. properties: clientId: description: The client id @@ -4599,7 +4599,7 @@ spec: oauth: description: |- OAuth defines the oauth config that is being used to authenticate. - Cannot be set at the same time as `managedIdentity`. + Cannot be set at the same time as `managedIdentity` or `sdk`. It requires Prometheus >= v2.48.0. @@ -4628,7 +4628,7 @@ spec: type: object x-kubernetes-map-type: atomic tenantId: - description: '`tenantID` is the tenant ID of the Azure Active Directory application that is being used to authenticate.' + description: '`tenantId` is the tenant ID of the Azure Active Directory application that is being used to authenticate.' minLength: 1 pattern: ^[0-9a-zA-Z-.]+$ type: string @@ -4637,6 +4637,20 @@ spec: - clientSecret - tenantId type: object + sdk: + description: |- + SDK defines the Azure SDK config that is being used to authenticate. + See https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication + Cannot be set at the same time as `oauth` or `managedIdentity`. + + + It requires Prometheus >= 2.52.0. + properties: + tenantId: + description: '`tenantId` is the tenant ID of the azure active directory application that is being used to authenticate.' + pattern: ^[0-9a-zA-Z-.]+$ + type: string + type: object type: object basicAuth: description: |- diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml index 26915378..d32f0938 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.14.0 - operator.prometheus.io/version: 0.73.2 + operator.prometheus.io/version: 0.74.0 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml index db77eceb..a872cf9f 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - operator.prometheus.io/version: 0.73.2 + operator.prometheus.io/version: 0.74.0 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml index be3f3b71..4eed90a3 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.14.0 - operator.prometheus.io/version: 0.73.2 + operator.prometheus.io/version: 0.74.0 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml index 65edfb6e..4fd51362 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.14.0 - operator.prometheus.io/version: 0.73.2 + operator.prometheus.io/version: 0.74.0 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml b/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml index fe2d5abd..0ccd9e79 100644 --- a/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml +++ b/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml @@ -12511,13 +12511,14 @@ items: "fields": "/value/", "values": false }, + "showPercentChange": false, "text": { "titleSize": 1 }, "textMode": "value", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -12576,9 +12577,6 @@ items: "y": 1 }, "id": 2, - "links": [ - - ], "options": { "colorMode": "value", "graphMode": "none", @@ -12591,10 +12589,11 @@ items: "fields": "", "values": false }, + "showPercentChange": false, "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -12671,6 +12670,7 @@ items: "id": 3, "options": { "displayMode": "lcd", + "maxVizHeight": 300, "minVizHeight": 10, "minVizWidth": 0, "namePlacement": "auto", @@ -12683,9 +12683,10 @@ items: "values": false }, "showUnfilled": true, + "sizing": "auto", "valueMode": "color" }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -12738,6 +12739,7 @@ items: "id": 4, "options": { "displayMode": "lcd", + "maxVizHeight": 300, "minVizHeight": 10, "minVizWidth": 0, "namePlacement": "auto", @@ -12750,9 +12752,10 @@ items: "values": false }, "showUnfilled": true, + "sizing": "auto", "valueMode": "color" }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -12869,9 +12872,6 @@ items: } ], "title": "Gitpod Version", - "transformations": [ - - ], "type": "timeseries" }, { @@ -12917,7 +12917,7 @@ items: "fillGradient": 5, "gridPos": { "h": 7, - "w": 12, + "w": 8, "x": 0, "y": 13 }, @@ -12936,15 +12936,12 @@ items: }, "lines": true, "linewidth": 1, - "links": [ - - ], "nullPointMode": "null", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -13333,7 +13330,7 @@ items: "fillGradient": 5, "gridPos": { "h": 7, - "w": 12, + "w": 8, "x": 0, "y": 38 }, @@ -13352,15 +13349,12 @@ items: }, "lines": true, "linewidth": 1, - "links": [ - - ], "nullPointMode": "null", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -13473,19 +13467,11 @@ items: "uid": "$datasource" }, "description": "Nodes with a high normalized load average do not represent a real problem, it only means that pods should probably not be scheduled to them.\n\nIf you'd like to see more details about resource consumption of a particular node, you can do so by clicking at the node name.\n", - "fieldConfig": { - "defaults": { - "unitScale": true - }, - "overrides": [ - - ] - }, "fill": 1, "fillGradient": 5, "gridPos": { "h": 7, - "w": 12, + "w": 8, "x": 0, "y": 46 }, @@ -13504,15 +13490,12 @@ items: }, "lines": true, "linewidth": 1, - "links": [ - - ], "nullPointMode": "null", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "10.3.1", + "pluginVersion": "10.4.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -13649,9 +13632,9 @@ items: }, "gridPos": { "h": 7, - "w": 12, + "w": 8, "x": 0, - "y": 46 + "y": 54 }, "heatmap": { @@ -13694,7 +13677,8 @@ items: }, "showValue": "never", "tooltip": { - "show": true, + "mode": "single", + "showColorScale": false, "yHistogram": false }, "yAxis": { @@ -13703,7 +13687,7 @@ items: "unit": "s" } }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "repeat": "cluster", "targets": [ { @@ -13744,7 +13728,7 @@ items: "h": 1, "w": 24, "x": 0, - "y": 53 + "y": 61 }, "id": 15, "panels": [ @@ -13777,9 +13761,9 @@ items: "fillGradient": 5, "gridPos": { "h": 7, - "w": 12, + "w": 8, "x": 0, - "y": 54 + "y": 62 }, "hiddenSeries": false, "id": 8, @@ -13796,15 +13780,12 @@ items: }, "lines": true, "linewidth": 1, - "links": [ - - ], "nullPointMode": "null", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -13916,7 +13897,7 @@ items: "h": 1, "w": 24, "x": 0, - "y": 61 + "y": 69 }, "id": 16, "panels": [ @@ -13948,9 +13929,9 @@ items: "fillGradient": 5, "gridPos": { "h": 7, - "w": 12, + "w": 8, "x": 0, - "y": 62 + "y": 70 }, "hiddenSeries": false, "id": 9, @@ -13967,15 +13948,12 @@ items: }, "lines": true, "linewidth": 1, - "links": [ - - ], "nullPointMode": "null", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -14057,7 +14035,7 @@ items: "h": 1, "w": 24, "x": 0, - "y": 69 + "y": 77 }, "id": 17, "panels": [ @@ -14089,9 +14067,9 @@ items: "fillGradient": 5, "gridPos": { "h": 7, - "w": 12, + "w": 8, "x": 0, - "y": 70 + "y": 78 }, "hiddenSeries": false, "id": 10, @@ -14108,15 +14086,12 @@ items: }, "lines": true, "linewidth": 1, - "links": [ - - ], "nullPointMode": "null", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.5.3", + "pluginVersion": "10.4.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -14180,7 +14155,7 @@ items: ], "refresh": "30s", "revision": 1, - "schemaVersion": 38, + "schemaVersion": 39, "tags": [ ], @@ -14189,8 +14164,8 @@ items: { "current": { "selected": false, - "text": "prometheus", - "value": "P1809F7CD0C75ACF3" + "text": "VictoriaMetrics", + "value": "P4169E866C3094E38" }, "hide": 0, "includeAll": false, diff --git a/vendor/github.com/gitpod-io/gitpod/operations/observability/mixins/cross-teams/dashboards/gitpod-overview.json b/vendor/github.com/gitpod-io/gitpod/operations/observability/mixins/cross-teams/dashboards/gitpod-overview.json index ef76837a..45b57e09 100644 --- a/vendor/github.com/gitpod-io/gitpod/operations/observability/mixins/cross-teams/dashboards/gitpod-overview.json +++ b/vendor/github.com/gitpod-io/gitpod/operations/observability/mixins/cross-teams/dashboards/gitpod-overview.json @@ -91,13 +91,14 @@ "fields": "/value/", "values": false }, + "showPercentChange": false, "text": { "titleSize": 1 }, "textMode": "value", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -148,7 +149,6 @@ "y": 1 }, "id": 2, - "links": [], "options": { "colorMode": "value", "graphMode": "none", @@ -161,10 +161,11 @@ "fields": "", "values": false }, + "showPercentChange": false, "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -235,6 +236,7 @@ "id": 3, "options": { "displayMode": "lcd", + "maxVizHeight": 300, "minVizHeight": 10, "minVizWidth": 0, "namePlacement": "auto", @@ -247,9 +249,10 @@ "values": false }, "showUnfilled": true, + "sizing": "auto", "valueMode": "color" }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -296,6 +299,7 @@ "id": 4, "options": { "displayMode": "lcd", + "maxVizHeight": 300, "minVizHeight": 10, "minVizWidth": 0, "namePlacement": "auto", @@ -308,9 +312,10 @@ "values": false }, "showUnfilled": true, + "sizing": "auto", "valueMode": "color" }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -421,7 +426,6 @@ } ], "title": "Gitpod Version", - "transformations": [], "type": "timeseries" }, { @@ -463,7 +467,7 @@ "fillGradient": 5, "gridPos": { "h": 7, - "w": 12, + "w": 8, "x": 0, "y": 13 }, @@ -482,13 +486,12 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -851,7 +854,7 @@ "fillGradient": 5, "gridPos": { "h": 7, - "w": 12, + "w": 8, "x": 0, "y": 38 }, @@ -870,13 +873,12 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -979,17 +981,11 @@ "uid": "$datasource" }, "description": "Nodes with a high normalized load average do not represent a real problem, it only means that pods should probably not be scheduled to them.\n\nIf you'd like to see more details about resource consumption of a particular node, you can do so by clicking at the node name.\n", - "fieldConfig": { - "defaults": { - "unitScale": true - }, - "overrides": [] - }, "fill": 1, "fillGradient": 5, "gridPos": { "h": 7, - "w": 12, + "w": 8, "x": 0, "y": 46 }, @@ -1008,13 +1004,12 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "10.3.1", + "pluginVersion": "10.4.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -1139,9 +1134,9 @@ }, "gridPos": { "h": 7, - "w": 12, + "w": 8, "x": 0, - "y": 46 + "y": 54 }, "heatmap": {}, "hideZeroBuckets": true, @@ -1178,7 +1173,8 @@ }, "showValue": "never", "tooltip": { - "show": true, + "mode": "single", + "showColorScale": false, "yHistogram": false }, "yAxis": { @@ -1187,7 +1183,7 @@ "unit": "s" } }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "repeat": "cluster", "targets": [ { @@ -1228,7 +1224,7 @@ "h": 1, "w": 24, "x": 0, - "y": 53 + "y": 61 }, "id": 15, "panels": [], @@ -1257,9 +1253,9 @@ "fillGradient": 5, "gridPos": { "h": 7, - "w": 12, + "w": 8, "x": 0, - "y": 54 + "y": 62 }, "hiddenSeries": false, "id": 8, @@ -1276,13 +1272,12 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -1388,7 +1383,7 @@ "h": 1, "w": 24, "x": 0, - "y": 61 + "y": 69 }, "id": 16, "panels": [], @@ -1416,9 +1411,9 @@ "fillGradient": 5, "gridPos": { "h": 7, - "w": 12, + "w": 8, "x": 0, - "y": 62 + "y": 70 }, "hiddenSeries": false, "id": 9, @@ -1435,13 +1430,12 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "10.2.2", + "pluginVersion": "10.4.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -1517,7 +1511,7 @@ "h": 1, "w": 24, "x": 0, - "y": 69 + "y": 77 }, "id": 17, "panels": [], @@ -1545,9 +1539,9 @@ "fillGradient": 5, "gridPos": { "h": 7, - "w": 12, + "w": 8, "x": 0, - "y": 70 + "y": 78 }, "hiddenSeries": false, "id": 10, @@ -1564,13 +1558,12 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.5.3", + "pluginVersion": "10.4.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -1626,15 +1619,15 @@ ], "refresh": "30s", "revision": 1, - "schemaVersion": 38, + "schemaVersion": 39, "tags": [], "templating": { "list": [ { "current": { "selected": false, - "text": "prometheus", - "value": "P1809F7CD0C75ACF3" + "text": "VictoriaMetrics", + "value": "P4169E866C3094E38" }, "hide": 0, "includeAll": false, diff --git a/vendor/github.com/grafana/jsonnet-libs/grafana-builder/grafana.libsonnet b/vendor/github.com/grafana/jsonnet-libs/grafana-builder/grafana.libsonnet index f4a9745a..0bd0b339 100644 --- a/vendor/github.com/grafana/jsonnet-libs/grafana-builder/grafana.libsonnet +++ b/vendor/github.com/grafana/jsonnet-libs/grafana-builder/grafana.libsonnet @@ -1,5 +1,3 @@ -local utils = import 'mixin-utils/utils.libsonnet'; - { dashboard(title, uid='', datasource='default', datasource_regex=''):: { // Stuff that isn't materialised. @@ -72,40 +70,6 @@ local utils = import 'mixin-utils/utils.libsonnet'; }, }, - addShowNativeLatencyVariable():: self { - templating+: { - list+: [{ - current: { - selected: true, - text: 'classic', - value: '1', - }, - description: 'Choose between showing latencies based on low precision classic or high precision native histogram metrics.', - hide: 0, - includeAll: false, - label: 'Latency metrics', - multi: false, - name: 'latency_metrics', - query: 'native : -1,classic : 1', - options: [ - { - selected: false, - text: 'native', - value: '-1', - }, - { - selected: true, - text: 'classic', - value: '1', - }, - ], - skipUrlSync: false, - type: 'custom', - useTags: false, - }], - }, - }, - dashboardLinkUrl(title, url):: self { links+: [ { @@ -456,20 +420,18 @@ local utils = import 'mixin-utils/utils.libsonnet'; }, ], - httpStatusColors:: { - '1xx': '#EAB839', - '2xx': '#7EB26D', - '3xx': '#6ED0E0', - '4xx': '#EF843C', - '5xx': '#E24D42', - OK: '#7EB26D', - success: '#7EB26D', - 'error': '#E24D42', - cancel: '#A9A9A9', - }, - qpsPanel(selector, statusLabelName='status_code'):: { - aliasColors: $.httpStatusColors, + aliasColors: { + '1xx': '#EAB839', + '2xx': '#7EB26D', + '3xx': '#6ED0E0', + '4xx': '#EF843C', + '5xx': '#E24D42', + OK: '#7EB26D', + success: '#7EB26D', + 'error': '#E24D42', + cancel: '#A9A9A9', + }, targets: [ { expr: @@ -486,65 +448,6 @@ local utils = import 'mixin-utils/utils.libsonnet'; ], } + $.stack, - // Assumes that the metricName is for a histogram (as opposed to qpsPanel above) - // Assumes that there is a dashboard variable named latency_metrics, values are -1 (native) or 1 (classic) - qpsPanelNativeHistogram(metricName, selector, statusLabelName='status_code'):: { - local sumByStatus(nativeClassicQuery) = { - local template = - ||| - sum by (status) ( - label_replace(label_replace(%(metricQuery)s, - "status", "${1}xx", "%(label)s", "([0-9]).."), - "status", "${1}", "%(label)s", "([a-zA-Z]+)")) - |||, - native: template % { metricQuery: nativeClassicQuery.native, label: statusLabelName }, - classic: template % { metricQuery: nativeClassicQuery.classic, label: statusLabelName }, - }, - fieldConfig+: { - defaults+: { - custom+: { - lineWidth: 0, - fillOpacity: 100, // Get solid fill. - stacking: { - mode: 'normal', - group: 'A', - }, - }, - unit: 'reqps', - min: 0, - }, - overrides+: [{ - matcher: { - id: 'byName', - options: status, - }, - properties: [ - { - id: 'color', - value: { - mode: 'fixed', - fixedColor: $.httpStatusColors[status], - }, - }, - ], - } for status in std.objectFieldsAll($.httpStatusColors)], - }, - targets: [ - { - expr: utils.showClassicHistogramQuery(sumByStatus(utils.nativeClassicHistogramCountRate(metricName, selector))), - format: 'time_series', - legendFormat: '{{status}}', - refId: 'A_classic', - }, - { - expr: utils.showNativeHistogramQuery(sumByStatus(utils.nativeClassicHistogramCountRate(metricName, selector))), - format: 'time_series', - legendFormat: '{{status}}', - refId: 'A', - }, - ], - } + $.stack, - latencyPanel(metricName, selector, multiplier='1e3'):: { nullPointMode: 'null as zero', targets: [ @@ -570,58 +473,6 @@ local utils = import 'mixin-utils/utils.libsonnet'; yaxes: $.yaxes('ms'), }, - // Assumes that there is a dashboard variable named latency_metrics, values are -1 (native) or 1 (classic) - latencyPanelNativeHistogram(metricName, selector, multiplier='1e3'):: { - nullPointMode: 'null as zero', - fieldConfig+: { - defaults+: { - custom+: { - fillOpacity: 10, - }, - unit: 'ms', - }, - }, - targets: [ - { - expr: utils.showNativeHistogramQuery(utils.nativeClassicHistogramQuantile('0.99', metricName, selector, multiplier=multiplier)), - format: 'time_series', - legendFormat: '99th percentile', - refId: 'A', - }, - { - expr: utils.showClassicHistogramQuery(utils.nativeClassicHistogramQuantile('0.99', metricName, selector, multiplier=multiplier)), - format: 'time_series', - legendFormat: '99th percentile', - refId: 'A_classic', - }, - { - expr: utils.showNativeHistogramQuery(utils.nativeClassicHistogramQuantile('0.50', metricName, selector, multiplier=multiplier)), - format: 'time_series', - legendFormat: '50th percentile', - refId: 'B', - }, - { - expr: utils.showClassicHistogramQuery(utils.nativeClassicHistogramQuantile('0.50', metricName, selector, multiplier=multiplier)), - format: 'time_series', - legendFormat: '50th percentile', - refId: 'B_classic', - }, - { - expr: utils.showNativeHistogramQuery(utils.nativeClassicHistogramAverageRate(metricName, selector, multiplier=multiplier)), - format: 'time_series', - legendFormat: 'Average', - refId: 'C', - }, - { - expr: utils.showClassicHistogramQuery(utils.nativeClassicHistogramAverageRate(metricName, selector, multiplier=multiplier)), - format: 'time_series', - legendFormat: 'Average', - refId: 'C_classic', - }, - ], - yaxes: $.yaxes('ms'), - }, - selector:: { eq(label, value):: { label: label, op: '=', value: value }, neq(label, value):: { label: label, op: '!=', value: value }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json index a8e09177..2e2cbb1b 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.14.0", - "operator.prometheus.io/version": "0.73.2" + "operator.prometheus.io/version": "0.74.0" }, "name": "alertmanagerconfigs.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json index f8bc6b2d..d13dc43c 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.14.0", - "operator.prometheus.io/version": "0.73.2" + "operator.prometheus.io/version": "0.74.0" }, "name": "alertmanagers.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json index baaa152d..da4e5a04 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.14.0", - "operator.prometheus.io/version": "0.73.2" + "operator.prometheus.io/version": "0.74.0" }, "name": "podmonitors.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json index 2fd7592c..ec84412b 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.14.0", - "operator.prometheus.io/version": "0.73.2" + "operator.prometheus.io/version": "0.74.0" }, "name": "probes.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json index 9514af5e..f509cac3 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.14.0", - "operator.prometheus.io/version": "0.73.2" + "operator.prometheus.io/version": "0.74.0" }, "name": "prometheusagents.monitoring.coreos.com" }, @@ -4080,7 +4080,7 @@ "type": "string" }, "managedIdentity": { - "description": "ManagedIdentity defines the Azure User-assigned Managed identity.\nCannot be set at the same time as `oauth`.", + "description": "ManagedIdentity defines the Azure User-assigned Managed identity.\nCannot be set at the same time as `oauth` or `sdk`.", "properties": { "clientId": { "description": "The client id", @@ -4093,7 +4093,7 @@ "type": "object" }, "oauth": { - "description": "OAuth defines the oauth config that is being used to authenticate.\nCannot be set at the same time as `managedIdentity`.\n\n\nIt requires Prometheus >= v2.48.0.", + "description": "OAuth defines the oauth config that is being used to authenticate.\nCannot be set at the same time as `managedIdentity` or `sdk`.\n\n\nIt requires Prometheus >= v2.48.0.", "properties": { "clientId": { "description": "`clientID` is the clientId of the Azure Active Directory application that is being used to authenticate.", @@ -4123,7 +4123,7 @@ "x-kubernetes-map-type": "atomic" }, "tenantId": { - "description": "`tenantID` is the tenant ID of the Azure Active Directory application that is being used to authenticate.", + "description": "`tenantId` is the tenant ID of the Azure Active Directory application that is being used to authenticate.", "minLength": 1, "pattern": "^[0-9a-zA-Z-.]+$", "type": "string" @@ -4135,6 +4135,17 @@ "tenantId" ], "type": "object" + }, + "sdk": { + "description": "SDK defines the Azure SDK config that is being used to authenticate.\nSee https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication\nCannot be set at the same time as `oauth` or `managedIdentity`.\n\n\nIt requires Prometheus >= 2.52.0.", + "properties": { + "tenantId": { + "description": "`tenantId` is the tenant ID of the azure active directory application that is being used to authenticate.", + "pattern": "^[0-9a-zA-Z-.]+$", + "type": "string" + } + }, + "type": "object" } }, "type": "object" diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json index be0b9a9f..58e92aba 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.14.0", - "operator.prometheus.io/version": "0.73.2" + "operator.prometheus.io/version": "0.74.0" }, "name": "prometheuses.monitoring.coreos.com" }, @@ -903,6 +903,75 @@ "items": { "description": "AlertmanagerEndpoints defines a selection of a single Endpoints object\ncontaining Alertmanager IPs to fire alerts against.", "properties": { + "alertRelabelings": { + "description": "Relabeling configs applied before sending alerts to a specific Alertmanager.\nIt requires Prometheus >= v2.51.0.", + "items": { + "description": "RelabelConfig allows dynamic rewriting of the label set for targets, alerts,\nscraped samples and remote write samples.\n\n\nMore info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config", + "properties": { + "action": { + "default": "replace", + "description": "Action to perform based on the regex matching.\n\n\n`Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.\n`DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.\n\n\nDefault: \"Replace\"", + "enum": [ + "replace", + "Replace", + "keep", + "Keep", + "drop", + "Drop", + "hashmod", + "HashMod", + "labelmap", + "LabelMap", + "labeldrop", + "LabelDrop", + "labelkeep", + "LabelKeep", + "lowercase", + "Lowercase", + "uppercase", + "Uppercase", + "keepequal", + "KeepEqual", + "dropequal", + "DropEqual" + ], + "type": "string" + }, + "modulus": { + "description": "Modulus to take of the hash of the source label values.\n\n\nOnly applicable when the action is `HashMod`.", + "format": "int64", + "type": "integer" + }, + "regex": { + "description": "Regular expression against which the extracted value is matched.", + "type": "string" + }, + "replacement": { + "description": "Replacement value against which a Replace action is performed if the\nregular expression matches.\n\n\nRegex capture groups are available.", + "type": "string" + }, + "separator": { + "description": "Separator is the string between concatenated SourceLabels.", + "type": "string" + }, + "sourceLabels": { + "description": "The source labels select values from existing labels. Their content is\nconcatenated using the configured Separator and matched against the\nconfigured regular expression.", + "items": { + "description": "LabelName is a valid Prometheus label name which may only contain ASCII\nletters, numbers, as well as underscores.", + "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$", + "type": "string" + }, + "type": "array" + }, + "targetLabel": { + "description": "Label to which the resulting string is written in a replacement.\n\n\nIt is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,\n`KeepEqual` and `DropEqual` actions.\n\n\nRegex capture groups are available.", + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, "apiVersion": { "description": "Version of the Alertmanager API that Prometheus uses to send alerts.\nIt can be \"v1\" or \"v2\".", "type": "string" @@ -5039,7 +5108,7 @@ "type": "string" }, "managedIdentity": { - "description": "ManagedIdentity defines the Azure User-assigned Managed identity.\nCannot be set at the same time as `oauth`.", + "description": "ManagedIdentity defines the Azure User-assigned Managed identity.\nCannot be set at the same time as `oauth` or `sdk`.", "properties": { "clientId": { "description": "The client id", @@ -5052,7 +5121,7 @@ "type": "object" }, "oauth": { - "description": "OAuth defines the oauth config that is being used to authenticate.\nCannot be set at the same time as `managedIdentity`.\n\n\nIt requires Prometheus >= v2.48.0.", + "description": "OAuth defines the oauth config that is being used to authenticate.\nCannot be set at the same time as `managedIdentity` or `sdk`.\n\n\nIt requires Prometheus >= v2.48.0.", "properties": { "clientId": { "description": "`clientID` is the clientId of the Azure Active Directory application that is being used to authenticate.", @@ -5082,7 +5151,7 @@ "x-kubernetes-map-type": "atomic" }, "tenantId": { - "description": "`tenantID` is the tenant ID of the Azure Active Directory application that is being used to authenticate.", + "description": "`tenantId` is the tenant ID of the Azure Active Directory application that is being used to authenticate.", "minLength": 1, "pattern": "^[0-9a-zA-Z-.]+$", "type": "string" @@ -5094,6 +5163,17 @@ "tenantId" ], "type": "object" + }, + "sdk": { + "description": "SDK defines the Azure SDK config that is being used to authenticate.\nSee https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication\nCannot be set at the same time as `oauth` or `managedIdentity`.\n\n\nIt requires Prometheus >= 2.52.0.", + "properties": { + "tenantId": { + "description": "`tenantId` is the tenant ID of the azure active directory application that is being used to authenticate.", + "pattern": "^[0-9a-zA-Z-.]+$", + "type": "string" + } + }, + "type": "object" } }, "type": "object" diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json index 6906fcfd..ca1dddd7 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.14.0", - "operator.prometheus.io/version": "0.73.2" + "operator.prometheus.io/version": "0.74.0" }, "name": "prometheusrules.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json index 93c24675..5188d77a 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.14.0", - "operator.prometheus.io/version": "0.73.2" + "operator.prometheus.io/version": "0.74.0" }, "name": "scrapeconfigs.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json index c1b611ea..d77746ba 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.14.0", - "operator.prometheus.io/version": "0.73.2" + "operator.prometheus.io/version": "0.74.0" }, "name": "servicemonitors.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json index 3a19b01e..ca6e0f2a 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.14.0", - "operator.prometheus.io/version": "0.73.2" + "operator.prometheus.io/version": "0.74.0" }, "name": "thanosrulers.monitoring.coreos.com" },