Merge pull request #2387 from geethub97/dev-v2.7

Forward-port fix from #40340
pull/2393/head
Geet Samra 2023-02-06 11:25:25 -08:00 committed by GitHub
commit 7d09394cc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 4 deletions

View File

@ -20,8 +20,8 @@ imagePullSecrets: []
service:
type: ClusterIP
port: 9100
targetPort: 9100
port: 9796
targetPort: 9796
nodePort:
portName: metrics
listenOnAllInterfaces: true

View File

@ -8717,7 +8717,7 @@ entries:
catalog.cattle.io/upstream-version: 19.0.3
apiVersion: v2
appVersion: 0.59.1
created: "2023-01-30T09:30:58.567357-08:00"
created: "2023-02-02T15:46:50.652807-08:00"
dependencies:
- condition: grafana.enabled
name: grafana
@ -8788,7 +8788,7 @@ entries:
description: Collects several related Helm charts, Grafana dashboards, and Prometheus
rules combined with documentation and scripts to provide easy to operate end-to-end
Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
digest: 6f5a899206b362cb363515e6ad450940cf08f6858e30743aaeb41e2206434868
digest: 8988f35d905053c861123f56da0cc87fb227bc4358fcbff126bafa56b9857c28
home: https://github.com/prometheus-operator/kube-prometheus
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
keywords:

View File

@ -20,6 +20,17 @@
pullPolicy: IfNotPresent
sha: ""
@@ -13,8 +20,8 @@
service:
type: ClusterIP
- port: 9100
- targetPort: 9100
+ port: 9796
+ targetPort: 9796
nodePort:
portName: metrics
listenOnAllInterfaces: true
@@ -95,9 +102,6 @@
## If true, create & use RBAC resources
##