Skip to content

Commit

Permalink
[stable/prometheus-operator] Update requirements (grafana, kube-state…
Browse files Browse the repository at this point in the history
…-metrics, kube-state-metrics) (helm#15285)

Signed-off-by: Asher Foa <asher@asherfoa.com>
  • Loading branch information
asherf authored and k8s-ci-robot committed Jul 17, 2019
1 parent 2af95ff commit ac55e67
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 10 deletions.
2 changes: 1 addition & 1 deletion stable/prometheus-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ name: prometheus-operator
sources:
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 5.15.0
version: 5.16.0
appVersion: 0.31.1
home: https://github.com/coreos/prometheus-operator
keywords:
Expand Down
12 changes: 9 additions & 3 deletions stable/prometheus-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ The following tables list the configurable parameters of the prometheus-operator
| `prometheusOperator.service.nodePort` | Port to expose prometheus operator service on each node | `30080` |
| `prometheusOperator.service.annotations` | Annotations to be added to the prometheus operator service | `{}` |
| `prometheusOperator.service.labels` | Prometheus Operator Service Labels | `{}` |
| `prometheusOperator.service.externalIPs` | List of IP addresses at which the Prometheus Operator server service is available | `[]` |
| `prometheusOperator.service.externalIPs` | List of IP addresses at which the Prometheus Operator server service is available | `[]` |
| `prometheusOperator.service.loadBalancerIP` | Prometheus Operator Loadbalancer IP | `""` |
| `prometheusOperator.service.loadBalancerSourceRanges` | Prometheus Operator Load Balancer Source Ranges | `[]` |
| `prometheusOperator.resources` | Resource limits for prometheus operator | `{}` |
Expand Down Expand Up @@ -199,7 +199,7 @@ The following tables list the configurable parameters of the prometheus-operator
| `prometheus.service.additionalPorts` | Additional Prometheus Service ports to add for NodePort service type | `[]` |
| `prometheus.service.annotations` | Prometheus Service Annotations | `{}` |
| `prometheus.service.labels` | Prometheus Service Labels | `{}` |
| `prometheus.service.externalIPs` | List of IP addresses at which the Prometheus server service is available | `[]` |
| `prometheus.service.externalIPs` | List of IP addresses at which the Prometheus server service is available | `[]` |
| `prometheus.service.loadBalancerIP` | Prometheus Loadbalancer IP | `""` |
| `prometheus.service.loadBalancerSourceRanges` | Prometheus Load Balancer Source Ranges | `[]` |
| `prometheus.service.sessionAffinity` | Prometheus Service Session Affinity | `""` |
Expand Down Expand Up @@ -275,7 +275,7 @@ The following tables list the configurable parameters of the prometheus-operator
| `alertmanager.service.nodePort` | Alertmanager Service port for NodePort service type | `30903` |
| `alertmanager.service.annotations` | Alertmanager Service annotations | `{}` |
| `alertmanager.service.labels` | Alertmanager Service Labels | `{}` |
| `alertmanager.service.externalIPs` | List of IP addresses at which the Alertmanager server service is available | `[]` |
| `alertmanager.service.externalIPs` | List of IP addresses at which the Alertmanager server service is available | `[]` |
| `alertmanager.service.loadBalancerIP` | Alertmanager Loadbalancer IP | `""` |
| `alertmanager.service.loadBalancerSourceRanges` | Alertmanager Load Balancer Source Ranges | `[]` |
| `alertmanager.config` | Provide YAML to configure Alertmanager. See https://prometheus.io/docs/alerting/configuration/#configuration-file. The default provided works to suppress the Watchdog alert from `defaultRules.create` | `{"global":{"resolve_timeout":"5m"},"route":{"group_by":["job"],"group_wait":"30s","group_interval":"5m","repeat_interval":"12h","receiver":"null","routes":[{"match":{"alertname":"Watchdog"},"receiver":"null"}]},"receivers":[{"name":"null"}]}` |
Expand Down Expand Up @@ -307,15 +307,21 @@ The following tables list the configurable parameters of the prometheus-operator
| `alertmanager.alertmanagerSpec.additionalPeers` | AdditionalPeers allows injecting a set of additional Alertmanagers to peer with to form a highly available cluster. | `[]` |

### Grafana
This is not a full list of the possible values.

For a full list of configurable values please refer to the [Grafana chart](https://github.com/helm/charts/tree/master/stable/grafana#configuration).

| Parameter | Description | Default |
| ----- | ----------- | ------ |
| `grafana.enabled` | If true, deploy the grafana sub-chart | `true` |
| `grafana.image.tag` | Image tag. (`Must be >= 5.0.0`) | `6.2.5` |
| `grafana.serviceMonitor.selfMonitor` | Create a `serviceMonitor` to automatically monitor the grafana instance | `true` |
| `grafana.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping the grafana instance. | `` |
| `grafana.serviceMonitor.relabelings` | The `relabel_configs` for scraping the grafana instance. | `` |
| `grafana.additionalDataSources` | Configure additional grafana datasources | `[]` |
| `grafana.adminPassword` | Admin password to log into the grafana UI | "prom-operator" |
| `grafana.defaultDashboardsEnabled` | Deploy default dashboards. These are loaded using the sidecar | `true` |
| `grafana.grafana.ini` | Grafana's primary configuration | `{}`
| `grafana.ingress.enabled` | Enables Ingress for Grafana | `false` |
| `grafana.ingress.annotations` | Ingress annotations for Grafana | `{}` |
| `grafana.ingress.labels` | Custom labels for Grafana Ingress | `{}` |
Expand Down
10 changes: 5 additions & 5 deletions stable/prometheus-operator/requirements.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies:
- name: kube-state-metrics
repository: https://kubernetes-charts.storage.googleapis.com/
version: 1.6.3
version: 1.6.5
- name: prometheus-node-exporter
repository: https://kubernetes-charts.storage.googleapis.com/
version: 1.5.0
version: 1.5.1
- name: grafana
repository: https://kubernetes-charts.storage.googleapis.com/
version: 3.3.10
digest: sha256:7e2bb81348c99897fca9fffd21c0a2e5bbbd93200a249fabe4c1576b700f43de
generated: 2019-06-01T00:40:22.8458175+01:00
version: 3.5.10
digest: sha256:a3d1b543bd95ccc050bec80481dc4ab231d8c8e9febda173654c462ab9105b48
generated: "2019-07-10T09:21:49.560501-07:00"
2 changes: 1 addition & 1 deletion stable/prometheus-operator/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ dependencies:
condition: nodeExporter.enabled

- name: grafana
version: 3.3.*
version: 3.5.*
repository: https://kubernetes-charts.storage.googleapis.com/
condition: grafana.enabled

0 comments on commit ac55e67

Please sign in to comment.