1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-08 10:04:09 +00:00
Commit graph

2014 commits

Author SHA1 Message Date
Lucas Serven
cefa36ede1
.github: request operator version in issues 2018-07-20 17:59:18 +02:00
Frederic Branczyk
4d9a8af878
Merge pull request #1592 from grnhse/allow-setting-prometheus-pod-annotations
Add ability to specify pod metadata
2018-07-20 13:25:31 +02:00
Frederic Branczyk
855e61c38a
Merge pull request #1650 from squat/r-22
Merge release 0.22 back into master
2018-07-20 13:24:52 +02:00
Giancarlo Rubio
a7c5c5c44b
Merge branch 'master' into allow-setting-prometheus-pod-annotations 2018-07-20 12:16:03 +02:00
Giancarlo Rubio
ea0f33186f
Update Chart.yaml 2018-07-20 12:15:41 +02:00
Giancarlo Rubio
8c531f5d35
Update requirements.yaml 2018-07-20 12:15:30 +02:00
Lucas Serven
82dba2dfeb
Merge branch 'master' into r-22 2018-07-20 11:59:50 +02:00
Ricardo Hernandez
e8ddf20399 [helm/prometheus] Rename extra rules (#1586)
* Use prometheus.fullname and append extra-rules to additional rules
2018-07-20 11:59:13 +02:00
Lucas Servén Marín
b9ea452916
Merge pull request #1642 from squat/cut-0.22.1
*: cut 0.22.1
2018-07-19 17:43:52 +02:00
Lucas Serven
2d723f9707
*: cut 0.22.1 2018-07-19 17:19:22 +02:00
Frederic Branczyk
9a8a58d679
Merge pull request #1640 from squat/manage-crds
pkg: add flag to toggle CRD creation in operator
2018-07-19 17:09:50 +02:00
Lucas Serven
0b4f44b77f
contrib: regenerate 2018-07-19 16:05:34 +02:00
Lucas Serven
149db8f7d8
pkg/prometheus: don't watch new ns if ns selected
If the Prometheus Operator has been configured to watch only a specific
namespace, then we should not run the namespace informer.
2018-07-19 15:19:27 +02:00
Lucas Serven
875a82ac6a
pkg: add flag to toggle CRD creation in operator
In certain Prometheus Operator deployment scenarios it is desirable to
manage CRD creation outside of the operator. Likewise, it can be
desirable to scope the permissions of the Prometheus Operator so that it
does not have cluster-level access. This commit enables operation in
these situations by adding a flag to configure whether or not the
Prometheus Operator should try to create CRDs itself.
2018-07-19 15:19:24 +02:00
Frederic Branczyk
a24386e2d5
Merge pull request #1633 from brancz/regenerate
Update jsonnet dependencies
2018-07-18 11:56:45 +02:00
Frederic Branczyk
05e6bb5068
Update jsonnet dependencies 2018-07-18 10:25:09 +02:00
Frederic Branczyk
ce3513359c
Merge pull request #1616 from directionless/adjustable-kube-state-metrics
Configure kube-state-metrics
2018-07-17 20:13:23 +02:00
Frederic Branczyk
aa15be9204
*: Re-generate 2018-07-17 19:49:42 +02:00
Frederic Branczyk
3a382bf65b
Merge pull request #1624 from The-smooth-operator/update-dead-links
Update dead links to latest version of Kubernetes docs
2018-07-17 16:28:17 +02:00
seph
89d47328cc Set default scrape values
We default to a 30s scrapeInterval, we may as well also set scrapeTimeout to the same.
2018-07-17 10:24:10 -04:00
seph
e6212fa7dc Resource config now in config.kubeStateMetrics
As requested, this updates the resource specification to live directly in config.kubeStateMetrics

It also clarifies the config variables. These names are what google uses in some of their tooling.

(And a slight tweak to the way collectors are specified)
2018-07-17 09:59:48 -04:00
The-smooth-operator
c23020443f Generate new docs after updating dead links 2018-07-17 15:26:55 +02:00
The-smooth-operator
aa15966742 Merge remote-tracking branch 'upstream/master' into update-dead-links 2018-07-17 15:22:53 +02:00
Max Inden
50d4801b57
security: Enforce nobody user and read only / (#1393)
* Make the Prometheus Operator Docker image run as `nobody` by default.
* Disallow privilege escalation via K8s
* Enforce read only root filesystem
2018-07-17 15:11:46 +02:00
Max Inden
1df9a0c28f
Makefile: Properly rebuild po-docgen on src changes (#1625) 2018-07-17 15:10:38 +02:00
The-smooth-operator
da36ff984e Update dead links to latest version of Kubernetes docs 2018-07-17 10:24:34 +02:00
Vasily Sliouniaev
cfd3b8b788 helm: Use CRDs for rules for operator 0.20.0+ (#1581)
* helm: Use CRDs for rules for operator 0.20.0+

Changed rules configmapst push -f to be PrometheusRule instead
Deprecated `additionalRulesConfigMapLabels` in favor of `additionalRulesLabels`

Fixes #1523, #1576, #1595

* helm: Rename configmap files to prometheusrule

* helm: Remove alert-rules labels from rules

Since rules are now sourced from CRDs and rules can be for recording

* helm: Bump chart versions
2018-07-17 08:50:48 +02:00
seph
af242cc1ae Configure kube-state-metrics
As I work with kube-state-metrics in a large cluster, I found I needed to make some adjustments.

- Expose the collectors, allowing one to configure exclusions. 

- Expose the addon_resizer parameters, facilitating reproduce adjustments

- Allow adjusting scrapeTimeout and scrapeInterval
2018-07-17 00:40:47 -04:00
Frederic Branczyk
bf569245d2
Merge pull request #1610 from cofyc/fix_port_int_labelname
bugfix: fix alertmanager port number label name
2018-07-12 09:26:47 +02:00
Yecheng Fu
d3a0a30a8e bugfix: fix pod number label, which should be __meta_kubernetes_pod_container_port_number 2018-07-12 15:02:38 +08:00
Frederic Branczyk
9eb9a0715a
Merge pull request #1475 from mrueg/json-log
operator: Support json as a log format
2018-07-10 16:00:45 +02:00
Max Inden
1146947431
Merge pull request #1597 from mxinden/cut-0.22.0
*: Cut 0.22.0
2018-07-10 14:22:33 +02:00
Max Leonard Inden
34acc95d87
*: Cut 0.22.0 2018-07-10 13:41:50 +02:00
Max Leonard Inden
ca3ba97b34
test/e2e: Fix wrong override of Prometheus config reloader arg
The e2e framework overrides the Prometheus config reloader argument of
the Prometheus Operator. Instead of overriding the correct argument, it
had been overriding the config reloader argument, resulting in two
specifications of the Prometheus config reloader argument one shadowing
the other.

This has only now caused problems as previously v0.21.0 would win, which
is present on quay.io. With the new release (v0.22.0) it fails as the
Prometheus config reloader v0.22.0 is not yet present on quay.io.

This patch resolves the wrong override and thereby fixes the e2e tests.
2018-07-10 13:10:37 +02:00
Frederic Branczyk
3db93ccdb6
Merge pull request #1584 from brancz/tags
Allow settings custom tags of container images
2018-07-09 15:08:10 +02:00
Manuel Rüger
cde8d96abf config-reloader: Support json as a log format 2018-07-09 13:50:37 +02:00
Manuel Rüger
558d13b26f operator: Support json as a log format 2018-07-09 13:50:37 +02:00
Frederic Branczyk
20706e9af4
Merge pull request #1594 from mxinden/update-readme
README.md: Update
2018-07-09 13:40:32 +02:00
Frederic Branczyk
ddef190142
Merge pull request #1500 from mxinden/shellcheck
format: Introduce shellcheck [1] for shell script analysis
2018-07-09 13:24:20 +02:00
Frederic Branczyk
8858027c32
Merge pull request #1589 from brancz/ci-enable-subresources
scripts: Enable subresources on CI
2018-07-09 13:23:34 +02:00
Frederic Branczyk
fdda073683
*: Allow settings custom tags of container images 2018-07-09 13:23:00 +02:00
Max Leonard Inden
ddf9343010
README.md: Update
- Add Prometheus Rule CRD
- Update development/testing section
- Remove `v0.1.0` migration section
2018-07-09 11:57:05 +02:00
Frederic Branczyk
d6094484f7
scripts: Enable subresources on CI 2018-07-09 11:54:17 +02:00
Frederic Branczyk
4e45b6a9bf
Merge pull request #1591 from mxinden/print-logs
test/e2e: Decrease config map data limit
2018-07-09 11:52:25 +02:00
Max Leonard Inden
a232986a01
test/e2e: Decrease config map data limit
The config map data limit seems to differ between environments. This
might result from different meta data sizes accross environments. Adding
a big buffer fixes the problem.
2018-07-09 11:25:35 +02:00
Max Leonard Inden
8fe1d28aa7
format: Introduce shellcheck [1] for shell script analysis
[1] https://github.com/koalaman/shellcheck
2018-07-08 16:58:17 +02:00
Michael Raimondi
ccf8867cdb Kube-prometheus: add additional labels for rules configMap (#1444)
* add additional labels for rules configMap

bring kube-prometheus closer to feature parity with other Helm configs
2018-07-06 10:20:13 +02:00
Nicolas Trangez
970f99fe97 Helm: Support 'external' node_exporters (#1560)
Similar to how `exporter-kube-etcd` supports monitoring of etcd clusters
running outside the Kubernetes cluster, this patch permits to configure
`exporter-node` to *not* deploy `node_exporter` as a `DaemonSet` in the
cluster, and instead fetch metrics from pre-provisioned `node_exporter`
instances, e.g. deployed as part of the host OS.
2018-07-06 09:43:23 +02:00
Valentyn Boginskey
1a2c6324c0 Add ability to specify pod metadata 2018-07-05 20:51:31 -04:00
Vasily Sliouniaev
3f143e2da0 helm: Allow setting pod selector on etcd (#1569)
* helm: Allow setting pod selector on etcd

Kubeadm uses different labels
2018-07-05 21:20:08 +02:00