1
0
mirror of https://github.com/coreos/prometheus-operator.git synced 2026-02-05 15:46:31 +01:00
Commit Graph

2123 Commits

Author SHA1 Message Date
Frederic Branczyk
79cb7bfbc8 Merge pull request #1759 from bhavin192/helm-readme-typo
helm: fix typo in prometheus README.md
2018-08-07 09:12:37 +02:00
Bhavin Gandhi
29fa506536 helm: fix typo in prometheus README.md
Changes `merics` to `metrics`

Signed-off-by: Bhavin Gandhi <bhavin7392@gmail.com>
2018-08-07 10:02:04 +05:30
Lucas Servén Marín
82ac491061 Merge pull request #1751 from squat/changelog
CHANGELOG: update changelog
v0.23.0
2018-08-06 17:04:02 +02:00
Lucas Servén Marín
d6fd947254 Merge pull request #1753 from mxinden/bin-packing
pkg/prometheus: Make Rule ConfigMap bin packing deterministic
2018-08-06 17:03:03 +02:00
Max Leonard Inden
35dfcf6cbb pkg/prometheus: Make Rule ConfigMap bin packing deterministic
Instead of iterating over a map, iterate over a sorted array of map
keys. This is relevant e.g. in a case with two small and one large
RuleFile. [small, large, small] results in three ConfigMaps, [small,
small, large] results in two.
2018-08-06 16:31:10 +02:00
Lucas Serven
564f0e575e jsonnet: fix comment style for PO libsonnet 2018-08-06 16:05:45 +02:00
Lucas Serven
c740d3af79 *: cut 0.23.0 2018-08-06 16:05:42 +02:00
Max Inden
ac60dbcb08 Merge pull request #1750 from mxinden/rm-cm-migration
pkg/prometheus: Remove rule ConfigMap migration
2018-08-06 15:22:18 +02:00
Max Leonard Inden
88ec2e6914 pkg/prometheus: Remove rule ConfigMap migration
Remove Prometheus rule ConfigMap live migration code introduced in #1399
[1].

[1] https://github.com/coreos/prometheus-operator/pull/1399
2018-08-06 14:49:10 +02:00
Lucas Serven
8550cb161a CHANGELOG: update changelog 2018-08-06 13:40:25 +02:00
Max Inden
661410f9f5 Merge pull request #1749 from squat/nsinf
pkg: don't rely on ns informer if ns selected
2018-08-06 12:50:29 +02:00
Frederic Branczyk
07d941443c Merge pull request #1746 from bosgood/thanos-resources
Add support for custom Thanos sidecar resources
2018-08-06 09:04:22 +02:00
Nick
823ac4edcf Ensure honorLabels is set to true for prometheus-operator ServiceMonitor (#1722) 2018-08-06 07:50:01 +02:00
Lucas Servén Marín
a25f8bc787 Merge pull request #1744 from mxinden/fix-metric
prometheus: Fix wrong metric increase
2018-08-06 00:41:02 +02:00
Lucas Serven
5efb25369a pkg: don't rely on ns informer if ns selected
If the operator is not watching all namespaces, then the namespace
informer is not started. This means that all operations that depend on
listing namespaces based on the informer will not work. This commit
modifies those operations so that they work in a single-namespace
configuration.
2018-08-06 00:32:37 +02:00
Brad Osgood
344f4e21b1 Rebuild generated sources 2018-08-04 14:50:13 -04:00
Brad Osgood
252ee595d8 Add support for custom Thanos sidecar resources 2018-08-04 14:29:31 -04:00
Max Leonard Inden
cc65dfafe9 prometheus: Fix wrong metric increase
Instead of increasing the Prometheus Rule trigger counter, the
ServiceMonitor trigger counter was increased.
2018-08-04 16:57:29 +02:00
Frederic Branczyk
ab75c2f02f Merge pull request #1734 from kanolato/chore/storage-docs
storage docs
2018-08-03 18:30:47 +02:00
kanolato
dffd893cce embedded examples of persistent prometheus 2018-08-03 07:48:17 -05:00
Max Inden
7ac97a92a3 Merge pull request #1737 from mxinden/hash
prometheus: Use hashstructure package for input checksum
2018-08-02 21:58:25 +02:00
Frederic Branczyk
42ed46706f Merge pull request #1738 from coreos/helm-warning
[helm] create a helm note explaining repo migration
2018-08-02 20:42:54 +02:00
Max Leonard Inden
767c36bb2d prometheus: Use hashstructure package for input checksum
Instead of marshalling all StatefulSet inputs to JSON and hashing that
string, use hashstructure [1] package. In addition do not generate new
rule config maps if underlying rules did not change.

[1] github.com/mitchellh/hashstructure
2018-08-02 19:55:41 +02:00
Giancarlo Rubio
fc734853cc create a helm note explaining repo migration 2018-08-02 15:27:51 +02:00
Frederic Branczyk
3d30a7caa1 Merge pull request #1733 from vasrem/fix_create_rb_using_the_correct_serviceaccount
Change roleBindingSpecificNamespaces to use $._config.namespace
2018-08-02 11:27:51 +02:00
Frederic Branczyk
1dfceeecd1 kube-prometheus: Re-generate 2018-08-02 11:00:53 +02:00
Vasilis Remmas
87358f68ef Create rolebinding using $._config.namespace
Assign the rolebinding to an existing serviceaccount
2018-08-02 10:59:34 +02:00
Frederic Branczyk
297321da8d Merge pull request #1726 from brancz/fix-jsonnet-lock
kube-prometheus: Fix jsonnet lock file
2018-08-02 10:55:15 +02:00
kanolato
af73cb6ccc storage docs 2018-08-01 21:35:33 -05:00
Frederic Branczyk
bb1966b2a1 Merge pull request #1708 from prune998/prune/jsonner-namespace-roles
Prune/jsonnet namespace roles
2018-08-01 14:02:03 +02:00
prune
33ab6b886d minor update as requested in PR 2018-08-01 07:35:28 -04:00
Frederic Branczyk
d752d2aca1 Merge pull request #1724 from mxinden/readme
*/README.md: Include 'Contributing' section
2018-08-01 13:03:59 +02:00
Frederic Branczyk
f369c28016 kube-prometheus: Fix jsonnet lock file 2018-08-01 11:40:00 +02:00
Max Inden
d7afb09489 Merge pull request #1718 from mxinden/metric
prometheus: Improve metrics and stop reconciling on no update
prometheus: Enqueue both P in NS as well as P selecting obj in NS
2018-08-01 10:44:55 +02:00
Max Leonard Inden
30ff105ce4 */README.md: Include 'Contributing' section 2018-08-01 10:41:29 +02:00
Max Leonard Inden
fbf5df64ec prometheus: Enqueue both P in NS as well as P selecting obj in NS
By default if a new object (servicemonitor, secret, ...) is created /
updated / deleted, we reconcile all Prometheus instances in that
namespace. In addition we also need to reconcile all Prometheus
instances selecting objects (ServiceMonitors, PrometheusRules) in that
namespace.
2018-08-01 10:03:58 +02:00
Max Leonard Inden
81dc703284 prometheus: Improve metrics and stop reconciling on no update
- Introduce the 'prometheus_operator_triggered_total'
Prometheus metric counter, differentiated in label dimensions:
  - triggered_by
    - monitoringv1.PrometheusesKind
    - monitoringv1.ServiceMonitorsKind
    - monitoringv1.PrometheusRuleKind
    - "ConfigMap"
    - "Secret"
    - "StatefulSet"
    - "Namespace"
  - action
    - "add"
    - "delete"
    - "update"

- Add increase hooks of above mentioned metric to all Kubernetes
informer handlers and add simple log line on debug level.

- Add condition to Kubernetes informer update handlers to only preceed
when previous resource version is not equal to new resource version.
This will prevent triggering a reconciliation loop on informer resyncs.
2018-08-01 08:46:07 +02:00
Or Sela
3f27de9047 alertmanager: Configurable data retention (#1710)
Make data retention configurable and add unit tests for both Alertmanager and Prometheus data retention.
2018-08-01 08:43:46 +02:00
prune
199bc26971 added newline in doc file 2018-07-31 14:49:13 -04:00
Edward Vella
774d29a48c Adding a nodeSelector to the exporter-node daemonset (#1698)
* Adding a nodeSelector to the exporter-node daemonset

Incrementing the chart version for exporter-node

* Incrementing the chart version for kube-prometheus

* Update Chart.yaml
2018-07-29 14:03:04 +02:00
prune
72d01973c6 Merge remote-tracking branch 'origin/prune/jsonner-namespace-roles' into prune/jsonner-namespace-roles 2018-07-27 07:48:23 -04:00
prune
0784908454 allow creation of role and rolebindings for other namespaces in jsonnet
replaced default namespaces rbac rules by a loop


set right variable name
2018-07-27 07:48:17 -04:00
prune
ccf3660934 set right variable name 2018-07-27 07:47:03 -04:00
prune
1f8988647b replaced default namespaces rbac rules by a loop 2018-07-27 07:05:42 -04:00
prune
1e9f9ca12d allow creation of role and rolebindings for other namespaces in jsonnet 2018-07-26 14:58:12 -04:00
Lucas Servén Marín
5318247b24 Merge pull request #1707 from squat/errreturn
pkg: return err
2018-07-26 18:18:11 +02:00
Lucas Serven
2523f95d93 pkg: return err
We are mistakingly not returning an error and allowing a function to
continue.
2018-07-26 17:52:53 +02:00
Frederic Branczyk
54dd0e9ece Merge pull request #1706 from mxinden/indexer
client-go/informers: Add namespace indexer to SharedIndexInformers (-> `master`)
2018-07-26 14:51:01 +02:00
Frederic Branczyk
cde207db80 Merge pull request #1705 from mxinden/bump-am
alertmanager: Default to v0.15.1
2018-07-26 12:01:57 +02:00
Max Leonard Inden
7e84d81e5f alertmanager: Default to v0.15.1 2018-07-26 11:23:35 +02:00