Skip to content

Commit

Permalink
Add script for custom Prometheus configuration. Update README.
Browse files Browse the repository at this point in the history
  • Loading branch information
camilb committed Oct 26, 2017
1 parent a462ee2 commit 1286336
Show file tree
Hide file tree
Showing 6 changed files with 589 additions and 2 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,8 @@ To remove everything, just execute the `./teardown` script.
* **update grafana dashboards:** add or change the existing dashboards in `assets/grafana/` and execute `scripts/generate-dashboards-configmap.sh`. Then apply the changes using `kubectl apply -f manifests/grafana/grafana-dashboards.cm.yaml`.

**Note:** all the Grafana dashboards should have names ending in `-dashboard.json`.

## Custom Prometheus configuration

The official documentation for Prometheus Operator custom configuration can be found here: [custom-configuration.md](https://github.com/coreos/prometheus-operator/blob/master/Documentation/custom-configuration.md)
If you wish, you can update the Prometheus configuration using the `./tools/custom-configuration/update_config` script.
4 changes: 2 additions & 2 deletions deploy
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#########################################################################################
#components default version
#########################################################################################
GRAFANA_DEFAULT_VERSION=4.6.0-beta2
PROMETHEUS_DEFAULT_VERSION=v2.0.0-rc.1
GRAFANA_DEFAULT_VERSION=4.6.0-beta3
PROMETHEUS_DEFAULT_VERSION=v2.0.0-rc.2
PROMETHEUS_OPERATOR_DEFAULT_VERSION=v0.14.0
ALERTMANAGER_DEFAULT_VERSION=v0.9.1
NODE_EXPORTER_DEFAULT_VERSION=v0.15.0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"items":[{"key":"monitoring/prometheus-k8s-rules","checksum":"a228d0b1ffcaee89767e0763cb589c5341fbb504d75e5e005a16a053b44a7460"}]}
Loading

0 comments on commit 1286336

Please sign in to comment.