From 69c604aa79fbc4ad255851bda3c3ca9b8c7fc965 Mon Sep 17 00:00:00 2001 From: Prometheus Operator Bot Date: Mon, 23 Oct 2023 07:39:42 +0000 Subject: [PATCH] [bot] [main] Automated version update --- jsonnet/kube-prometheus/versions.json | 2 +- jsonnetfile.lock.json | 36 +++++++++---------- manifests/blackboxExporter-deployment.yaml | 2 +- manifests/kubeStateMetrics-deployment.yaml | 4 +-- manifests/nodeExporter-daemonset.yaml | 2 +- manifests/prometheusOperator-deployment.yaml | 2 +- ...0scrapeconfigCustomResourceDefinition.yaml | 19 ++++++++++ 7 files changed, 43 insertions(+), 24 deletions(-) diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 7b9078a828..c541248b9c 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -7,7 +7,7 @@ "prometheus": "2.47.2", "prometheusAdapter": "0.11.1", "prometheusOperator": "0.68.0", - "kubeRbacProxy": "0.14.3", + "kubeRbacProxy": "0.15.0", "configmapReload": "0.5.0", "pyrra": "0.6.4" } diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 32b06336b5..1f7b5381b6 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,8 +18,8 @@ "subdir": "contrib/mixin" } }, - "version": "569640f278e5ee731e80448a395b3398851199b7", - "sum": "LTbR+JGJ0gW3AdJQRl24VIKyKnPlPFaB+d+iysj4IU0=" + "version": "7f2936dfba80f9d62aa0de1f5ae21b4731187cb7", + "sum": "xuUBd2vqF7asyVDe5CE08uPT/RxAdy8O75EjFJoMXXU=" }, { "source": { @@ -58,8 +58,8 @@ "subdir": "gen/grafonnet-v10.0.0" } }, - "version": "16f374fcebd987bc1d8bc526f433a75e2e5dcb28", - "sum": "oteDmtf/QpAaG1F+lDtEhf0AYWKa+6cGVv41ncaSdh4=" + "version": "9e217263ac4b922ca2e00bc5cc36ada2311bb5a6", + "sum": "gj/20VIGucG2vDGjG7YdHLC4yUUfrpuaneUYaRmymOM=" }, { "source": { @@ -68,7 +68,7 @@ "subdir": "grafana-builder" } }, - "version": "981fe02c0ac0421b74db444de6b9f9b012b3f67c", + "version": "280304aaf0d65d24e69cc964d801e790652a73c8", "sum": "xEFMv4+ObwP5L1Wu0XK5agWci4AJzNApys6iKAQxLlQ=" }, { @@ -78,8 +78,8 @@ "subdir": "doc-util" } }, - "version": "fd8de9039b3c06da77d635a3a8289809a5bfb542", - "sum": "mFebrE9fhyAKW4zbnidcjVFupziN5LPA/Z7ii94uCzs=" + "version": "503e5c8fe96d6b55775037713ac10b184709ad93", + "sum": "BY4u0kLF3Qf/4IB4HnX9S5kEQIpHb4MUrppp6WLDtlU=" }, { "source": { @@ -88,8 +88,8 @@ "subdir": "" } }, - "version": "0256a910ac71f0f842696d7bca0bf01ea77eb654", - "sum": "zBOpb1oTNvXdq9RF6yzTHill5r1YTJLBBoqyx4JYtAg=" + "version": "42adb4b347a89c8e07f7ea7d459dee50fe56afe3", + "sum": "V1fCscAmNomABItd9KJUYj1hcy/yXR4elCrGVE/JLlw=" }, { "source": { @@ -108,7 +108,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "5c71459a614eaf8370bed2f406899f2269edff66", + "version": "eac6d3b1c994bd7dbd76026188d2b374bf000f20", "sum": "+dOzAK+fwsFf97uZpjcjTcEJEC1H8hh/j8f5uIQK/5g=" }, { @@ -118,7 +118,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "5c71459a614eaf8370bed2f406899f2269edff66", + "version": "eac6d3b1c994bd7dbd76026188d2b374bf000f20", "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c=" }, { @@ -128,7 +128,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "75f05e1988716d8610e4aa513437e271443964e9", + "version": "5c45e5ed091675dd2fa425df1d3b9e4acf59bf8e", "sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=", "name": "prometheus-operator-mixin" }, @@ -139,8 +139,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "75f05e1988716d8610e4aa513437e271443964e9", - "sum": "gl4yvv+WLjt+CaTW4/urKAMx8fs9I4K8PgZ4PyOMD58=" + "version": "5c45e5ed091675dd2fa425df1d3b9e4acf59bf8e", + "sum": "qaOMdU1XG3MTGzZ504Ug4cDR0RODOLcU/BdfY0PDs/E=" }, { "source": { @@ -149,7 +149,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "acb58400fd2b324dd4cc56110c8e891e8b1c0420", + "version": "280a742b766d0b4079b02be100cf9541e29f0a20", "sum": "1d7ZKYArJKacAWXLUz0bRC1uOkozee/PPw97/W5zGhc=", "name": "alertmanager" }, @@ -160,7 +160,7 @@ "subdir": "docs/node-mixin" } }, - "version": "0f6a4d8c3970f452131a97f14ca200660f46fc2b", + "version": "6122cee47a39ef35de5698b348fc5cf9343f28a5", "sum": "By6n6U10hYDogUsyhsaKZehbhzxBZZobJloiKyKadgM=" }, { @@ -170,7 +170,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "dcaca86958531929752d9cb5f52eb03d390a3b8f", + "version": "a807dd16160f0816d5f03bfed72a5321372b0de4", "sum": "8OngT76gVXOUROOOeP9yTe6E/dn+2D2J34Dn690QCG0=", "name": "prometheus" }, @@ -192,7 +192,7 @@ "subdir": "mixin" } }, - "version": "77fac932094be5cac69c9ea0c5c85c3f4ac0e5be", + "version": "5c983470903b2521ce1db1f848539b7390bcb91f", "sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=", "name": "thanos-mixin" }, diff --git a/manifests/blackboxExporter-deployment.yaml b/manifests/blackboxExporter-deployment.yaml index 3c3b61b00d..daf96b95cb 100644 --- a/manifests/blackboxExporter-deployment.yaml +++ b/manifests/blackboxExporter-deployment.yaml @@ -84,7 +84,7 @@ spec: - --secure-listen-address=:9115 - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 - --upstream=http://127.0.0.1:19115/ - image: quay.io/brancz/kube-rbac-proxy:v0.14.3 + image: quay.io/brancz/kube-rbac-proxy:v0.15.0 name: kube-rbac-proxy ports: - containerPort: 9115 diff --git a/manifests/kubeStateMetrics-deployment.yaml b/manifests/kubeStateMetrics-deployment.yaml index a8c62717c8..f240a52e10 100644 --- a/manifests/kubeStateMetrics-deployment.yaml +++ b/manifests/kubeStateMetrics-deployment.yaml @@ -55,7 +55,7 @@ spec: - --secure-listen-address=:8443 - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 - --upstream=http://127.0.0.1:8081/ - image: quay.io/brancz/kube-rbac-proxy:v0.14.3 + image: quay.io/brancz/kube-rbac-proxy:v0.15.0 name: kube-rbac-proxy-main ports: - containerPort: 8443 @@ -82,7 +82,7 @@ spec: - --secure-listen-address=:9443 - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 - --upstream=http://127.0.0.1:8082/ - image: quay.io/brancz/kube-rbac-proxy:v0.14.3 + image: quay.io/brancz/kube-rbac-proxy:v0.15.0 name: kube-rbac-proxy-self ports: - containerPort: 9443 diff --git a/manifests/nodeExporter-daemonset.yaml b/manifests/nodeExporter-daemonset.yaml index 0b37775aac..8297cc80fb 100644 --- a/manifests/nodeExporter-daemonset.yaml +++ b/manifests/nodeExporter-daemonset.yaml @@ -72,7 +72,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: quay.io/brancz/kube-rbac-proxy:v0.14.3 + image: quay.io/brancz/kube-rbac-proxy:v0.15.0 name: kube-rbac-proxy ports: - containerPort: 9100 diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml index 89a58ca048..9f178c0c4a 100644 --- a/manifests/prometheusOperator-deployment.yaml +++ b/manifests/prometheusOperator-deployment.yaml @@ -52,7 +52,7 @@ spec: - --secure-listen-address=:8443 - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 - --upstream=http://127.0.0.1:8080/ - image: quay.io/brancz/kube-rbac-proxy:v0.14.3 + image: quay.io/brancz/kube-rbac-proxy:v0.15.0 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml index b6cb5b9c6f..4f767f12da 100644 --- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml +++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml @@ -479,6 +479,22 @@ spec: required: - key type: object + filters: + description: 'Filters can be used optionally to filter the instance list by other criteria. Available filter criteria can be found here: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstances.html Filter API documentation: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Filter.html' + items: + description: EC2Filter is the configuration for filtering EC2 instances. + properties: + name: + type: string + values: + items: + type: string + type: array + required: + - name + - values + type: object + type: array port: description: The port to scrape metrics from. If using the public IP address, this must instead be specified in the relabeling rule. type: integer @@ -489,6 +505,9 @@ spec: region: description: The AWS region type: string + roleARN: + description: AWS Role ARN, an alternative to using AWS API keys. + type: string secretKey: description: SecretKey is the AWS API secret. properties: