Merge pull request #71 from geethub97/main

Fixing federator versioning

charts/prometheus-federator/0.2.3/Chart.yaml → charts/prometheus-federator/0.3.1/Chart.yaml

@@ -9,12 +9,12 @@ annotations:
   catalog.cattle.io/rancher-version: '>= 2.6.5-0 < 2.8.0-0'
   catalog.cattle.io/release-name: prometheus-federator
 apiVersion: v2
-appVersion: 0.2.2
+appVersion: 0.3.1
 dependencies:
 - condition: helmProjectOperator.enabled
   name: helmProjectOperator
   repository: file://./charts/helmProjectOperator
 description: Prometheus Federator
 icon: https://raw.githubusercontent.com/rancher/prometheus-federator/main/assets/logos/prometheus-federator.svg
 name: prometheus-federator
-version: 0.2.3
+version: 0.3.1

charts/prometheus-federator/0.2.3/charts/helmProjectOperator/Chart.yaml → charts/prometheus-federator/0.3.1/charts/helmProjectOperator/Chart.yaml

@@ -9,7 +9,7 @@ annotations:
   catalog.cattle.io/rancher-version: '>= 2.6.0-0'
   catalog.cattle.io/release-name: helm-project-operator
 apiVersion: v2
-appVersion: 0.1.0
+appVersion: 0.2.0
 description: Helm Project Operator
 name: helmProjectOperator
-version: 0.1.1
+version: 0.2.0

charts/prometheus-federator/0.2.3/charts/helmProjectOperator/templates/deployment.yaml → charts/prometheus-federator/0.3.1/charts/helmProjectOperator/templates/deployment.yaml

@@ -6,7 +6,9 @@ metadata:
   labels: {{ include "helm-project-operator.labels" . | nindent 4 }}
     app: {{ template "helm-project-operator.name" . }}
 spec:
-  replicas: 1
+  {{- if .Values.replicas }}
+  replicas: {{ .Values.replicas }}
+  {{- end }}
   selector:
     matchLabels:
       app: {{ template "helm-project-operator.name" . }}

charts/prometheus-federator/0.2.3/charts/helmProjectOperator/values.yaml → charts/prometheus-federator/0.3.1/charts/helmProjectOperator/values.yaml

@@ -126,9 +126,11 @@ nameOverride: ""
 
 namespaceOverride: ""
 
+replicas: 1
+
 image:
   repository: rancher/helm-project-operator
-  tag: v0.1.0
+  tag: v0.2.0
   pullPolicy: IfNotPresent
 
 helmController:

charts/prometheus-federator/0.2.3/values.yaml → charts/prometheus-federator/0.3.1/values.yaml

@@ -58,7 +58,7 @@ helmProjectOperator:
 
   image:
     repository: rancher/prometheus-federator
-    tag: v0.2.2
+    tag: v0.3.1
     pullPolicy: IfNotPresent
 
   # Additional arguments to be passed into the Prometheus Federator image

charts/rancher-project-monitoring/0.3.0/templates/alertmanager/alertmanager.yaml

@@ -162,4 +162,4 @@ spec:
 {{- if .Values.alertmanager.alertmanagerSpec.minReadySeconds }}
   minReadySeconds: {{ .Values.alertmanager.alertmanagerSpec.minReadySeconds }}
 {{- end }}
-{{- end }}
+{{- end }}

charts/rancher-project-monitoring/0.3.0/templates/rancher-monitoring/hardened.yaml

@@ -126,4 +126,4 @@ spec:
   policyTypes:
   - Ingress
   - Egress
-{{- end }}
+{{- end }}

charts/rancher-project-monitoring/0.3.0/values.yaml

@@ -1548,4 +1548,4 @@ prometheus:
 
 ## Setting to true produces cleaner resource names, but requires a data migration because the name of the persistent volume changes. Therefore this should only be set once on initial installation.
 ##
-cleanPrometheusOperatorObjectNames: false
+cleanPrometheusOperatorObjectNames: false

charts/rancher-project-monitoring/0.3.1/Chart.yaml

@@ -0,0 +1,33 @@
+annotations:
+  catalog.cattle.io/certified: rancher
+  catalog.cattle.io/display-name: Project Monitoring
+  catalog.cattle.io/hidden: "true"
+  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.26.0-0'
+  catalog.cattle.io/permits-os: linux,windows
+  catalog.cattle.io/rancher-version: '>= 2.6.5-0 <= 2.8.0-0'
+  catalog.cattle.io/release-name: rancher-project-monitoring
+apiVersion: v2
+appVersion: 0.59.1
+dependencies:
+- condition: grafana.enabled
+  name: grafana
+  repository: file://./charts/grafana
+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. Depends on the existence of a Cluster
+  Prometheus deployed via Prometheus Operator
+home: https://github.com/prometheus-operator/kube-prometheus
+icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
+keywords:
+- prometheus
+- monitoring
+kubeVersion: '>=1.16.0-0'
+maintainers:
+- email: [email protected]
+  name: Arvind
+- email: [email protected]
+  name: Geet
+  url: https://github.com/geethub97
+name: rancher-project-monitoring
+type: application
+version: 0.3.1

charts/rancher-project-monitoring/0.3.1/README.md

@@ -0,0 +1,29 @@
+# rancher-project-monitoring
+
+This chart installs a project-scoped version of [`rancher-monitoring`](https://rancher.com/docs/rancher/v2.6/en/monitoring-alerting), a Helm chart based off of [`kube-prometheus stack`](https://github.com/prometheus-operator/kube-prometheus). It deploys a collection of Kubernetes manifests, [Grafana](http://grafana.com/) dashboards, and [Prometheus rules](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/) combined with documentation and scripts to provide easy to operate end-to-end Kubernetes project monitoring with [Prometheus](https://prometheus.io/) using the [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator). See the [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus) README for details about components, dashboards, and alerts.
+
+## Prerequisites
+
+- Kubernetes 1.16+
+- Helm 3+
+
+## Install Chart
+
+This chart is not intended for standalone use; it's intended to be deployed via [Prometheus Federator](https://github.com/rancher/prometheus-federator). For a Prometheus Stack intended to be deployed standalone, please use [rancher-monitoring](https://rancher.com/docs/rancher/v2.6/en/monitoring-alerting/) or the upstream [`kube-prometheus-stack`](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack) project.
+
+## Dependencies
+
+This chart is designed to be deployed alongside an existing Prometheus Operator deployment in a cluster that has already installed the Prometheus Operator CRDs. Specifically, the chart is configured and intended to be deployed alongside [`rancher-monitoring`](https://rancher.com/docs/rancher/v2.6/en/monitoring-alerting/), which deploys Prometheus Operator alongside a Cluster Prometheus that `rancher-project-monitoring` is configured to federate namespace-scoped metrics from by default.
+
+### Configuration
+
+Since this chart installs a project-scoped version of [`rancher-monitoring`](https://rancher.com/docs/rancher/v2.6/en/monitoring-alerting/), a Helm chart based off of [`kube-prometheus-stack`](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack), most of the options that apply to either of those charts will apply to this chart (e.g. support for configuring persistent volumes, ingresses, etc.) and can be passed in as part of the `spec.values` of the ProjectHelmChart that deploys this chart; however, certain advanced functionality (such as Thanos support) and options that pose security risks in Project environments (e.g. ability to `ignoreNamespaceSelectors` or modify the existing namepaceSelectors of the Cluster Prometheus, ability to mount additional scrape configs, etc.) have been removed from the `values.yaml` of the chart. For more information on how to configure values and what they mean, please see the comments and options provided on the `values.yaml` packaged with this chart.
+
+## Further Information
+
+For more in-depth documentation of configuration options meanings, please see
+
+- [`rancher-monitoring`](https://rancher.com/docs/rancher/v2.6/en/monitoring-alerting/)
+- [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator)
+- [Prometheus](https://prometheus.io/docs/introduction/overview/)
+- [Grafana](https://github.com/grafana/helm-charts/tree/main/charts/grafana#grafana-helm-chart)

charts/rancher-project-monitoring/0.3.1/app-README.md

@@ -0,0 +1,10 @@
+# Rancher Project Monitoring and Alerting
+
+The chart installs a Project Monitoring Stack, which contains:
+- [Prometheus](https://prometheus.io/) (managed externally by [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator))
+- [Alertmanager](https://prometheus.io/docs/alerting/latest/alertmanager/) (managed externally by [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator))
+- [Grafana](https://github.com/helm/charts/tree/master/stable/grafana) (deployed via an embedded Helm chart)
+- Default PrometheusRules and Grafana dashboards based on the collection of community-curated resources from [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus/)
+- Default ServiceMonitors that watch the deployed resources
+
+Note: This chart is not intended for standalone use; it's intended to be deployed via [Prometheus Federator](https://github.com/rancher/prometheus-federator).

charts/rancher-project-monitoring/0.3.1/charts/grafana/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.vscode
+.project
+.idea/
+*.tmproj
+OWNERS

charts/rancher-project-monitoring/0.3.1/charts/grafana/Chart.yaml

@@ -0,0 +1,29 @@
+annotations:
+  catalog.cattle.io/hidden: "true"
+  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.27.0-0'
+  catalog.cattle.io/os: linux
+  catalog.rancher.io/certified: rancher
+  catalog.rancher.io/namespace: cattle-monitoring-system
+  catalog.rancher.io/release-name: rancher-grafana
+apiVersion: v2
+appVersion: 9.1.5
+description: The leading tool for querying and visualizing time series and metrics.
+home: https://grafana.net
+icon: https://raw.githubusercontent.com/grafana/grafana/master/public/img/logo_transparent_400x.png
+kubeVersion: ^1.8.0-0
+maintainers:
+- email: [email protected]
+  name: zanhsieh
+- email: [email protected]
+  name: rtluckie
+- email: [email protected]
+  name: maorfr
+- email: [email protected]
+  name: Xtigyro
+- email: [email protected]
+  name: torstenwalter
+name: grafana
+sources:
+- https://github.com/grafana/grafana
+type: application
+version: 6.38.6