diff --git a/assets/rancher-monitoring/rancher-monitoring-104.1.3-rc.1+up57.0.3.tgz b/assets/rancher-monitoring/rancher-monitoring-104.1.3-rc.1+up57.0.3.tgz index 6bf041ca6..767167050 100644 Binary files a/assets/rancher-monitoring/rancher-monitoring-104.1.3-rc.1+up57.0.3.tgz and b/assets/rancher-monitoring/rancher-monitoring-104.1.3-rc.1+up57.0.3.tgz differ diff --git a/charts/rancher-monitoring/104.1.3-rc.1+up57.0.3/charts/windowsExporter/Chart.yaml b/charts/rancher-monitoring/104.1.3-rc.1+up57.0.3/charts/windowsExporter/Chart.yaml index 784bb0ec7..e3999c6ff 100644 --- a/charts/rancher-monitoring/104.1.3-rc.1+up57.0.3/charts/windowsExporter/Chart.yaml +++ b/charts/rancher-monitoring/104.1.3-rc.1+up57.0.3/charts/windowsExporter/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 diff --git a/charts/rancher-monitoring/104.1.3-rc.1+up57.0.3/charts/windowsExporter/values.yaml b/charts/rancher-monitoring/104.1.3-rc.1+up57.0.3/charts/windowsExporter/values.yaml index 04569505d..9b4a35a54 100644 --- a/charts/rancher-monitoring/104.1.3-rc.1+up57.0.3/charts/windowsExporter/values.yaml +++ b/charts/rancher-monitoring/104.1.3-rc.1+up57.0.3/charts/windowsExporter/values.yaml @@ -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 diff --git a/charts/rancher-monitoring/104.1.3-rc.1+up57.0.3/values.yaml b/charts/rancher-monitoring/104.1.3-rc.1+up57.0.3/values.yaml index d72b02fc9..f7e6872d1 100644 --- a/charts/rancher-monitoring/104.1.3-rc.1+up57.0.3/values.yaml +++ b/charts/rancher-monitoring/104.1.3-rc.1+up57.0.3/values.yaml @@ -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. diff --git a/index.yaml b/index.yaml index 78968da44..74fc8ed4c 100755 --- a/index.yaml +++ b/index.yaml @@ -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 @@ -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: diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/values.yaml.patch b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/values.yaml.patch index 733c7c5f4..059e1ab69 100644 --- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/values.yaml.patch @@ -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 ## diff --git a/packages/rancher-monitoring/rancher-windows-exporter/generated-changes/patch/Chart.yaml.patch b/packages/rancher-monitoring/rancher-windows-exporter/generated-changes/patch/Chart.yaml.patch new file mode 100644 index 000000000..d400840af --- /dev/null +++ b/packages/rancher-monitoring/rancher-windows-exporter/generated-changes/patch/Chart.yaml.patch @@ -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 diff --git a/packages/rancher-monitoring/rancher-windows-exporter/generated-changes/patch/values.yaml.patch b/packages/rancher-monitoring/rancher-windows-exporter/generated-changes/patch/values.yaml.patch index b8194192a..2a910c813 100644 --- a/packages/rancher-monitoring/rancher-windows-exporter/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-monitoring/rancher-windows-exporter/generated-changes/patch/values.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/values.yaml +++ charts/values.yaml -@@ -3,16 +3,16 @@ +@@ -3,16 +3,17 @@ # Declare variables to be passed into your templates. image: @@ -8,6 +8,7 @@ - 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" @@ -21,7 +22,7 @@ imagePullSecrets: [] # - name: "image-pull-secret" -@@ -32,15 +32,14 @@ +@@ -32,15 +33,14 @@ # - pullSecret1 # - pullSecret2 imagePullSecrets: [] @@ -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: @@ -60,7 +61,7 @@ scheme: http basicAuth: {} -@@ -228,8 +227,6 @@ +@@ -228,8 +228,6 @@ hostProcess: true runAsUserName: "NT AUTHORITY\\system"