Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

Update prometheus operator 0.43.2 #1162

Merged
merged 5 commits into from
Nov 26, 2020
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# This resource is created to scrape contour metrics once Contour component is
# updated. Only difference between the `alerts.yaml` and this is the name and
# the value of the label key `app`. This is done so that even if the just the
# Promtheus operator component is updated and not Contour, scraping of contour
# metrics is not interrupted.
{{- if .Values.monitoring.enable }}
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
name: alertmanager-rules-for-prometheus-0-43-2
namespace: projectcontour
labels:
release: prometheus-operator
app: kube-prometheus-stack
spec:
groups:
- name: contour-rules
rules:
- alert: ContourPodsAvailability
expr: kube_deployment_status_replicas_unavailable{deployment="contour",namespace="projectcontour"} != 0
for: 1m
annotations:
description: '"{{ `{{ $labels.instance }}` }}": Contour pod is not available for last one minute.'
summary: '"{{ `{{ $labels.instance }}` }}": Contour deployment pods.'
- name: envoy-rules
rules:
- alert: EnvoyPodsAvailability
expr: kube_daemonset_status_number_unavailable{daemonset="envoy",namespace="projectcontour"} != 0
for: 1m
annotations:
description: '"{{ `{{ $labels.instance }}` }}": Envoy pod is not available for last one minute.'
summary: '"{{ `{{ $labels.instance }}` }}": Envoy deployment pods.'
{{- end }}
6 changes: 4 additions & 2 deletions assets/charts/components/prometheus-operator/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# Contributing Guidelines
ipochi marked this conversation as resolved.
Show resolved Hide resolved

## How to contribute to this chart

1. Fork this repository, develop and test your Chart.
1. Bump the chart version for every change.
1. Ensure PR title has the prefix `[stable/prometheus-operator]`
1. Ensure PR title has the prefix `[kube-prometheus-stack]`
1. When making changes to rules or dashboards, see the README.md section on how to sync data from upstream repositories
1. Check the `hack/minikube` folder has scripts to set up minikube and components of this chart that will allow all components to be scraped. You can use this configuration when validating your changes.
1. Check for changes of RBAC rules.
1. Check for changes in CRD specs.
1. PR must pass the linter (`helm lint`)
1. PR must pass the linter (`helm lint`)
12 changes: 12 additions & 0 deletions assets/charts/components/prometheus-operator/Chart.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
dependencies:
- name: kube-state-metrics
repository: https://charts.helm.sh/stable
version: 2.9.4
- name: prometheus-node-exporter
repository: https://prometheus-community.github.io/helm-charts
version: 1.12.0
- name: grafana
repository: https://grafana.github.io/helm-charts
version: 5.8.16
digest: sha256:75b1d23f315cc1b1d9b1f1d5e139559d680297c731b59641d72c5c38ac4a3a88
generated: "2020-11-21T20:45:39.838380873Z"
52 changes: 40 additions & 12 deletions assets/charts/components/prometheus-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,50 @@
apiVersion: v1
appVersion: 0.41.0
description: Provides easy monitoring definitions for Kubernetes services, and deployment
and management of Prometheus instances.
engine: gotpl
home: https://github.com/coreos/prometheus-operator
annotations:
artifacthub.io/links: |
- name: Chart Source
url: https://github.com/prometheus-community/helm-charts
- name: Upstream Project
url: https://github.com/prometheus-operator/kube-prometheus
artifacthub.io/operator: "true"
apiVersion: v2
appVersion: 0.43.2
dependencies:
- condition: kubeStateMetrics.enabled
name: kube-state-metrics
repository: https://charts.helm.sh/stable
version: 2.9.*
- condition: nodeExporter.enabled
name: prometheus-node-exporter
repository: https://prometheus-community.github.io/helm-charts
version: 1.12.*
- condition: grafana.enabled
name: grafana
repository: https://grafana.github.io/helm-charts
version: 5.8.*
description: kube-prometheus-stack collects Kubernetes manifests, 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.
home: https://github.com/prometheus-operator/kube-prometheus
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
keywords:
- operator
- prometheus
- kube-prometheus
kubeVersion: '>=1.16.0-0'
maintainers:
- name: vsliouniaev
- name: bismarck
- email: gianrubio@gmail.com
name: gianrubio
name: prometheus-operator
- email: github.gkarthiks@gmail.com
name: gkarthiks
- email: scott@r6by.com
name: scottrigby
- email: miroslav.hadzhiev@gmail.com
name: Xtigyro
name: kube-prometheus-stack
sources:
- https://github.com/coreos/kube-prometheus
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
tillerVersion: '>=2.12.0'
version: 9.3.0
- https://github.com/prometheus-community/helm-charts
- https://github.com/prometheus-operator/kube-prometheus
type: application
version: 12.2.0
Loading