Commit Graph

65 Commits

Author SHA1 Message Date
Matthias Loibl 3c109369d4 Add a working Travis pipeline 2019-04-15 12:17:04 +02:00
Max Leonard Inden cbb03d387c *.sh: Set sane bash options on shell scripts
Adding the following accross the project:

```bash
/# exit immediately when a command fails
set -e
/# only exit with zero if all commands of the pipeline exit successfully
set -o pipefail
/# error on unset variables
+set -u

```
2018-08-16 11:20:38 +02:00
Frederic Branczyk 0a98b8edaf Remove grafana-dashboards-configmap-generator 2018-05-28 10:31:21 +02:00
Frederic Branczyk 3388f96afe Address comments 2018-05-06 08:29:52 -07:00
Frederic Branczyk edf21e4382 kube-prometheus/jsonnet: Use jsonnet-bundler 2018-04-28 19:05:19 +01:00
Frederic Branczyk 8c49a641e2 kube-prometheus/hack: Fix cyclic ServiceMonitor dependency
Previously the script errored out, as ServiceMonitor objects are only
registered once the Prometheus Operator is running.
2018-04-23 10:16:07 +01:00
Frederic Branczyk 507617e150 Remove old manifests and replace with jsonnet build 2018-04-13 13:36:34 +02:00
Michael Pietzsch e50adc0926 Grafana Update to 5.0.3 (#1149) 2018-03-26 05:25:41 -04:00
Max Leonard Inden 310f471cf6 contrib/kube: Add rbac role to discover prometheus
The current example-app setup in the kube-prometheus project is able to
discover scraping targets in the default namespace. It is not able to
discover the configured Alertmanager in the monitoring namespace.

This patch adds an alertmanager-discovery rbac role, to permit the
above described action. In addition it does the following cleanups:

- Remove kubeconfig configuration in deploy and teardown script. kubectl
chooses .kube/config whenever KUBECONFIG is not set by default

- Remove namespace specification option via NAMESPACE env var. In most
of the manifests the metadata/namespace was hardcoded anyways, in
addition in the promtheus frontend role binding the service account
namespace is hardcoded to default as well.

- Instead of `kubectl {apply,delete}` individual manifests, the deploy
and teardown shell scripts {apply,delete} on the entire folder.
2018-03-19 17:13:33 +01:00
Max Leonard Inden 2f302943fe Unify rule file label accross repository
In some cases we have been using `alert-rules` in some cases
`prometheus-rulefiles`. This led to confusion [1]. Instead, unify the
Prometheus rules configmap labels to:

```yaml
labels:
  role: alert-rules
```

[1] https://github.com/coreos/prometheus-operator/issues/1102
2018-03-19 14:24:48 +01:00
Francisco Ripoli 5d33cbb166 example service monitoring updated with missing config
added service account, role and role binding for the prometheus frontend
example, also updated prometheus to use the correct service account

fixes #1049
2018-03-08 17:36:05 +00:00
Jordan Jennings c54468ab7b Update to grafana 5.0.0 2018-03-01 11:32:42 -05:00
jordanjennings 1c3fb8462f Update to grafana 5.0.0-beta5 2018-02-26 08:24:11 -05:00
Frederic Branczyk e8a19234dc kube-prometheus/hack: Add generation for grafana dashboard source file 2018-02-12 11:50:04 +01:00
Antoine Legrand 8a0c21ff29 Merge pull request #968 from brancz/grafana-v5
kube-prometheus: Upgrade to grafana v5
2018-02-12 10:41:07 +01:00
Frederic Branczyk 85f88025f3 kube-prometheus: Upgrade to grafana v5 2018-02-09 13:21:37 +01:00
Frederic Branczyk acb10c1678 Merge pull request #973 from Ludek2/fixing#972
fixing#972
2018-02-09 11:14:01 +01:00
Scott Brenner 51515b1e2b Update wrap-dashboard.sh
Might as well, right?
2018-02-08 12:50:19 -08:00
ludek_navratil 37f7fd52e8 fixing#972 2018-02-08 17:21:44 +00:00
Frederic Branczyk ba5192bcaf kube-prometheus: Update Grafana image 2018-02-04 16:12:54 +01:00
Frederic Branczyk 9b134da849 Merge pull request #948 from Ludek2/fixing#947
fixing#947
2018-02-01 14:02:13 +01:00
ludek_navratil 614f8ee0a3 fixing#947 2018-01-31 19:48:28 +00:00
ludek_navratil aafb48c4db fixing inputname var assignment 2018-01-30 22:53:26 +00:00
Frederic Branczyk 642df8ac25 kube-prometheus: Fix generate scripts 2018-01-26 12:03:26 +01:00
Frederic Branczyk 546a2e6ac6 *: Use non-root 2018-01-23 16:14:17 +01:00
Frederic Branczyk f97b6af095 *: Adapt documentation and scripts to use minikube kubelet authN/authZ 2018-01-19 15:28:38 +01:00
Frederic Branczyk aacc95b74c kube-prometheus: bump various versions 2018-01-15 14:13:26 +01:00
Frederic Branczyk 5392443721 kube-prometheus: Add etcd dashboard 2018-01-10 14:46:00 +01:00
Giancarlo Rubio 68517f63b5 Delete chart exporter-kube-api because it has been replaced by kube-controller-manager alerts 2017-12-27 09:36:12 +01:00
Giancarlo Rubio 22eef956af Add script to keep kube-prometheus rules in sync with helm charts
Bump prometheus to 2.0.0, prometheus-operator to 0.15.0, alertmanager to 0.12.0 and node-exporter to 0.15.1, grafana to 4.6.3
migrate prometheus alerts to yaml notation
2017-12-27 09:35:53 +01:00
Peter Fiddes 64425be6b9 contrib: namespace warning to kube-prometheus
NAMESPACE feature in scripts implies it works. warnning ensures
that users are aware that its use requires further changes.

Alleviates #765
2017-11-29 11:31:42 +00:00
Nuala Gaffey bf6461b851 Wrapping the filename in quotes preserves the .yml suffix, so regex is no longer necessary 2017-11-28 19:22:17 -05:00
Nuala Gaffey ce20757475 Per issue 593, append .yml to each filename used in the generated configmap. I wasn't able to see alerts in the Prometheus UI until I did this 2017-11-27 17:04:43 -05:00
Nuala Gaffey 40d746e12a Promtool appends .yml, not .yaml, but for backwards compatibility, lets allow both 2017-11-22 16:41:05 -05:00
Arve Knudsen d04cccc526 Use grafanalib to generate Grafana dashboards 2017-10-30 22:05:25 +01:00
Eduardo Gonzalez c510324253 newline bugfix modified in grafana configmap generator 2017-10-22 11:20:57 +02:00
Frederic Branczyk 1b7c8cdf21 *: bump Prometheus to v2.0.0-rc.1 2017-10-17 20:13:40 +02:00
Frederic Branczyk 3388dd2e55 Merge pull request #670 from valdisrigdon/fix-datasource-configmap
Fix merging of -datasource.json files
2017-10-16 13:53:49 +02:00
Valdis Rigdon 7eed244db7 Fix merging of -datasource.json files
The merge was missing a new line at the end of the merge, so only
the first datasource was being put into the ConfigMap.
2017-10-13 11:55:56 -04:00
jordanjennings 1a30399883 [kube-prometheus] Update to Grafana 4.5.2 in template
In the generated version of this file at /contrib/kube-prometheus/manifests/grafana/grafana-deployment.yaml the version was bumped to 4.5.2 but seems it was overlooked in this templated version of the file.
2017-10-11 15:09:11 -04:00
Giap Tran 6aadd5cfd9 grafana_dashboards_generate: fix "file" local variable 2017-09-22 12:00:43 +07:00
Eduardo Gonzalez 3c4dec7a1c grafana-deployment-original file deleted 2017-09-15 11:43:13 +02:00
Eduardo Gonzalez 41972d362c added grafana-deployment updates when configmaps are generated 2017-09-14 15:26:45 +02:00
Eduardo Gonzalez ec4fabad9c set options added to main script 2017-09-14 12:46:00 +02:00
Eduardo Gonzalez e517658b57 dashboards removed from tool 2017-09-09 12:54:12 +02:00
Eduardo Gonzalez 46671b7ee4 grafana configmap generator tool added 2017-09-09 12:54:12 +02:00
Eduardo Gonzalez 53b616e77d deleted configmap generator 2017-09-09 12:54:12 +02:00
Eduardo Gonzalez 7067e8d6d1 Merge branch 'master' of https://github.com/coreos/prometheus-operator 2017-09-09 12:03:36 +02:00
Arve Knudsen ebffe0dae6 Refer to CRDs as opposed to TPRs 2017-09-07 11:21:59 +02:00
Frederic Branczyk 7708f8eb83 kube-prometheus: adapt deploy script to wait for CRDs 2017-08-28 09:37:24 +02:00