1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-16 01:06:27 +00:00
Commit graph

1871 commits

Author SHA1 Message Date
Max Leonard Inden
19f3150e8a
*: Refactor build system
- Move prometheus-config-reloader to cmd/
- Refactor Makefile & contrib/kube-prometheus/Makefile
- Only execute a target if its dependencies changed
  - Create empty target file for docker builds
- Replace promu with plain static `go build`
2018-06-12 13:56:57 +02:00
Max Inden
14d647a5c6
Merge pull request #1453 from simonpasquier/fix-doc-typo
doc: fix broken link
2018-06-09 12:45:16 +02:00
Simon Pasquier
a105d496b2 doc: fix broken link 2018-06-08 14:01:58 +02:00
Ali Rizwan
3c226f965e Updated helm chart to version v0.20.0 (#1440)
* Updated to version v0.20.0

* Updated version of prometheus config reloader
2018-06-07 17:32:40 +02:00
Frederic Branczyk
d08df5777c
Merge pull request #1450 from brancz/kube-prometheus-troubleshooting
kube-prometheus: Add troubleshooting and alertmanager docs
2018-06-07 14:01:35 +02:00
Giancarlo Rubio
72add07650
use the right kube-etcd label (#1447) 2018-06-07 12:19:33 +02:00
Frederic Branczyk
d2707660e5
kube-prometheus: Add docs on how to set Alertmanager configuration 2018-06-07 11:53:37 +02:00
Frederic Branczyk
48a6caeaba
kube-prometheus: Add troubleshooting section 2018-06-07 11:35:58 +02:00
Frederic Branczyk
4c9ac08b9b
Merge pull request #1449 from brancz/jsonnet-master
*: Use all jsonnet from master branch
2018-06-07 11:10:43 +02:00
Frederic Branczyk
c766f1ce30
Merge pull request #1445 from dimm0/patch-1
Added section about grafana config
2018-06-07 10:22:13 +02:00
Frederic Branczyk
775781ca85
*: Use all jsonnet from master branch 2018-06-07 10:04:05 +02:00
Frederic Branczyk
e4bef2405f
Merge pull request #1443 from coreos/extract-po-jsonnet
kube-prometheus: Extract prometheus-operator jsonnet out of contrib
2018-06-07 09:57:51 +02:00
Dmitry Mishin
661810d4ed
Added section about grafana config #1436 2018-06-06 11:42:24 -07:00
Frederic Branczyk
6faf98268e
kube-prometheus: Extract prometheus-operator jsonnet out of contrib 2018-06-06 18:01:32 +02:00
Nicolas Trangez
9e04964e1a helm/grafana: Allow to set custom Service labels (#1426)
See: e131164c42
2018-06-06 06:41:05 +02:00
Olve S. Hansen
698019c7ac Adding default value to serviceMonitorSelector (#1421)
Fixes #1420
2018-06-05 22:00:15 +02:00
Boa Ho Man
1d3c462fd5 Add instructions for new dashboards in the Grafana helm chart README (#1408)
* Add example for adding grafana dashboards in README
2018-06-05 20:07:55 +02:00
Max Inden
f67b87ff1f
Merge pull request #1429 from mxinden/cut-0.20.0
Cut 0.20.0
2018-06-05 16:56:22 +02:00
Frederic Branczyk
232f50ff91
Merge pull request #1432 from mxinden/hardcode-prometheus-reload
prometheus-config-reloader: Hardcode version
2018-06-05 16:52:40 +02:00
Frederic Branczyk
5fdbfb0907
Merge pull request #1431 from mxinden/remove-prom-spec
e2e/TestPrometheusDiscovery: Remove Prometheus version specification
2018-06-05 16:39:56 +02:00
Max Leonard Inden
bd5e20bc17
prometheus-config-reloader: Hardcode version
The prometheus-config-reloader will be released alongside the
prometheus-operator. Thereby it holds the same version.

For now we will manually hardcode that version. In the future this could
be achieved dynamically via a compiler flags.
2018-06-05 16:12:43 +02:00
Max Leonard Inden
ddef5e8bbf
e2e/TestPrometheusDiscovery: Remove Prometheus version specification 2018-06-05 15:48:42 +02:00
Max Leonard Inden
f776605974
*: Bump version to v0.20.0 2018-06-05 15:07:17 +02:00
Max Leonard Inden
528849e7a0
CHANGELOG.md: Add v0.20.0 & Next release entry 2018-06-05 15:07:13 +02:00
Frederic Branczyk
7d08e3d69c
Merge pull request #1430 from brancz/rule-rename
*: Rename RuleFile to PrometheusRule
2018-06-05 15:04:43 +02:00
Frederic Branczyk
f07d73bd1e
*: Remove PrometheusRuleSelector 2018-06-05 13:59:31 +02:00
Frederic Branczyk
fb32e57837
*: Rename RuleFile to PrometheusRule 2018-06-05 13:34:13 +02:00
Frederic Branczyk
5eb0b7414b
Merge pull request #1428 from mxinden/rename-container
prometheus-config-reloader/Makefile: Rename image to container
2018-06-05 10:46:26 +02:00
Max Leonard Inden
16085e0fff
prometheus-config-reloader/Makefile: Rename image to container 2018-06-05 10:12:24 +02:00
Frederic Branczyk
ff181be16f
Merge pull request #1423 from mxinden/rule-crd-docs
doc: Update alerting documentation to rule file crd
2018-06-05 09:49:43 +02:00
Frederic Branczyk
e974c18d94
Merge pull request #1422 from mxinden/migration-cli
cmd/po-rule-cm-to-rule-file-crds: Add migration CLI tool
2018-06-05 09:31:32 +02:00
Max Leonard Inden
81cc878109
doc: Update alerting documentation to rule file crd
Tested on minikube.
2018-06-05 09:10:35 +02:00
Max Leonard Inden
58a984bdb1
cmd/po-rule-cm-to-rule-file-crds: Add migration CLI tool
This patch adds a cli tool to migrate existing Prometheus rule config
maps to Prometheus rule file CRDs.

Usage:
```bash
cd cmd/po-rule-cm-to-rule-file-crds
go install
po-rule-cm-to-rule-file-crds \
--rule-config-map=../../contrib/kube-prometheus/manifests/prometheus-rules.yaml \
--rule-crds-destination=.
```
2018-06-05 09:06:52 +02:00
Frederic Branczyk
c1cc64664a
Merge pull request #1427 from mxinden/kube-prometheus-rule-crd
kube-prometheus: Adjust to new Prometheus rule file CRD
2018-06-05 08:46:23 +02:00
Max Inden
54d416773b
Merge pull request #1424 from ironcladlou/timestamp-hack
Fix conversion of Prometheus timestamp fields
2018-06-04 22:57:20 +02:00
Dan Mace
8b8a247072 Fix conversion of Prometheus timestamp fields
Fix a conversion issue which prevents updates to Prometheus resource timestamp
fields where the timestamp is a.) a value type and b.) a read-only API field
(i.e. creationTimestamp).
2018-06-04 16:36:15 -04:00
Max Leonard Inden
62baa3f73c
kube-prometheus: Adjust to new Prometheus rule file CRD
89fc4e3069 introduced the new Prometheus
rule file custom resource definition. This patch adjusts the
kube-prometheus project to use the new custom resource definition.
2018-06-04 20:23:02 +02:00
Frederic Branczyk
1afb7d850a
Merge pull request #1416 from brancz/update-validation
*: Update CRDs on boot
2018-06-04 16:57:25 +02:00
Max Inden
254edd18d5
Merge pull request #1407 from mxinden/rm-leftover
kube-prometheus: Remove duplicate unused files
2018-06-04 11:59:25 +02:00
Sander Aernouts
c782192ae7 fixed prometheus datasource configuration in graphana configmap (#1413)
* fixed prometheus datasource configuration in graphana configmap
2018-06-04 09:18:54 +02:00
Frederic Branczyk
098fd87e2c
Merge pull request #1410 from ball-hayden/patch-1
[Helm] Change Prometheus example alerting endpoint port to http
2018-06-01 17:50:49 +02:00
Frederic Branczyk
9e78d43f3c
*: Update CRDs on boot 2018-06-01 17:43:46 +02:00
Giancarlo Rubio
02165c1b48
Merge branch 'master' into patch-1 2018-06-01 16:41:58 +02:00
Giancarlo Rubio
b495ee0a9b
Update Chart.yaml 2018-06-01 16:41:24 +02:00
Giancarlo Rubio
0505a8b22f
Update requirements.yaml 2018-06-01 16:40:40 +02:00
Giancarlo Rubio
771b734278
Update Chart.yaml 2018-06-01 16:39:49 +02:00
Frederic Branczyk
626f552004
Merge pull request #1414 from gianrubio/helm-serviceMonitor
[helm] Add serviceMonitorNamespaceSelector to prometheus helm chart
2018-06-01 16:20:25 +02:00
Giancarlo Rubio
ad8753f337 Add serviceMonitorNamespaceSelector to prometheus helm chart 2018-06-01 15:00:23 +02:00
Hayden Ball
abb297c062 Helm - Prometheus: Change example alerting endpoint port to http
The Helm Prometheus chart expects alertingEndpoints to have a port
of http, not a port number.
I'm unsure of the reasoning behind this, but this corrects the
documentation to reflect the current behaviour.

See #1356
2018-05-31 21:23:06 +01:00
Frederic Branczyk
6f9d57a2af
Merge pull request #1409 from brancz/unnecessary-ns-sel
kube-prometheus: Remove unnecessary namespace selectors
2018-05-31 18:12:19 +02:00