Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dev-v2.9] rancher-monitoring 104.1.3-rc.1+up57.0.3 update #4809

Merged
merged 3 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
annotations:
catalog.cattle.io/hidden: "true"
catalog.cattle.io/kube-version: '>= 1.26.0-0 < 1.31.0-0'
catalog.cattle.io/os: windows
catalog.rancher.io/certified: rancher
catalog.rancher.io/namespace: cattle-monitoring-system
catalog.rancher.io/release-name: rancher-windows-exporter
apiVersion: v2
appVersion: 0.25.1
description: A Helm chart for prometheus windows-exporter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
image:
registry: docker.io
repository: rancher/mirrored-prometheus-windows-exporter
os: "windows"
# Overrides the image tag whose default is {{ printf "v%s" .Chart.AppVersion }}
tag: "0.25.1"
pullPolicy: IfNotPresent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4705,7 +4705,7 @@ prometheus:
## they will only discover targets within the namespace of the PodMonitor, ServiceMonitor and Probe object,
## and servicemonitors will be installed in the default service namespace.
## Defaults to false.
ignoreNamespaceSelectors: true
ignoreNamespaceSelectors: false

## EnforcedNamespaceLabel enforces adding a namespace label of origin for each alert and metric that is user created.
## The label value will always be the namespace of the object that is being created.
Expand Down
4 changes: 2 additions & 2 deletions index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21072,7 +21072,7 @@ entries:
catalog.cattle.io/upstream-version: 57.0.3
apiVersion: v2
appVersion: v0.72.0
created: "2024-11-27T15:58:56.229353808-04:00"
created: "2024-12-02T11:45:00.931061901-04:00"
dependencies:
- condition: grafana.enabled
name: grafana
Expand Down Expand Up @@ -21144,7 +21144,7 @@ entries:
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: 9489cf7b092ee478efd82048fb73546440a9734abf677baa3c5ace6c713e66bc
digest: 2f08d1d2bd71c4a848428af510e32e169aa8d42ca5a6d23e624a3d4810b026b3
home: https://github.com/prometheus-operator/kube-prometheus
icon: file://assets/logos/rancher-monitoring.png
keywords:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1269,15 +1269,6 @@

## InitContainers allows injecting additional initContainers. This is meant to allow doing some changes
## (permissions, dir tree) on mounted volumes before starting prometheus
@@ -3895,7 +4705,7 @@
## they will only discover targets within the namespace of the PodMonitor, ServiceMonitor and Probe object,
## and servicemonitors will be installed in the default service namespace.
## Defaults to false.
- ignoreNamespaceSelectors: false
+ ignoreNamespaceSelectors: true

## EnforcedNamespaceLabel enforces adding a namespace label of origin for each alert and metric that is user created.
## The label value will always be the namespace of the object that is being created.
@@ -4338,10 +5148,8 @@
## Image of ThanosRuler
##
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- charts-original/Chart.yaml
+++ charts/Chart.yaml
@@ -1,3 +1,10 @@
+annotations:
+ catalog.cattle.io/hidden: "true"
+ catalog.cattle.io/kube-version: '>= 1.26.0-0 < 1.31.0-0'
+ catalog.cattle.io/os: windows
+ catalog.rancher.io/certified: rancher
+ catalog.rancher.io/namespace: cattle-monitoring-system
+ catalog.rancher.io/release-name: rancher-windows-exporter
apiVersion: v2
appVersion: 0.25.1
description: A Helm chart for prometheus windows-exporter
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
--- charts-original/values.yaml
+++ charts/values.yaml
@@ -3,16 +3,16 @@
@@ -3,16 +3,17 @@
# Declare variables to be passed into your templates.

image:
- registry: ghcr.io
- repository: prometheus-community/windows-exporter
+ registry: docker.io
+ repository: rancher/mirrored-prometheus-windows-exporter
+ os: "windows"
# Overrides the image tag whose default is {{ printf "v%s" .Chart.AppVersion }}
- tag: ""
+ tag: "0.25.1"
Expand All @@ -21,7 +22,7 @@

imagePullSecrets: []
# - name: "image-pull-secret"
@@ -32,15 +32,14 @@
@@ -32,15 +33,14 @@
# - pullSecret1
# - pullSecret2
imagePullSecrets: []
Expand All @@ -41,7 +42,7 @@
annotations: {}

# Additional environment variables that will be passed to the daemonset
@@ -50,15 +49,15 @@
@@ -50,15 +50,15 @@

prometheus:
monitor:
Expand All @@ -60,7 +61,7 @@

scheme: http
basicAuth: {}
@@ -228,8 +227,6 @@
@@ -228,8 +228,6 @@
hostProcess: true
runAsUserName: "NT AUTHORITY\\system"

Expand Down