mirrors/prometheus-operator
mirrors/prometheus-operator
1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-16 01:06:27 +00:00
Code Activity
3784 commits 97 branches 309 tags 260 MiB
Commit graph

3784 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frederic Branczyk
ef0bc1c45a
Merge pull request #3377 from coderanger/patch-1 
🐛 Don't overwrite __param_target
 2020-08-03 11:11:06 +02:00
Noah Kantrowitz
41c2202698 🐛 Don't overwrite __param_target 
It is already set above using the sd metadata, no need to overwrite it back to __address__.
 2020-08-01 23:15:58 -07:00
Frederic Branczyk
6c8f7fa6b6
Merge pull request #3374 from vincent-pli/clearify-targetport-servicemonitor 
Clarify targetPort in endpoint
 2020-07-31 11:26:17 +02:00
Paweł Krupa
ab26c78117
Merge pull request #3379 from paulfantom/shellcheck 2020-07-31 09:52:21 +02:00
pengli
2ebe8247d8 Clarify targetPort in endpoint 2020-07-30 17:39:15 -07:00
paulfantom
69d5ea7cf7
decontainerize shellcheck 2020-07-30 20:42:00 +02:00
Sergiusz Urbaniak
f194e03498
Merge pull request #3376 from s-urbaniak/release-0.41 
Cut release version 0.41.0
 2020-07-30 11:10:09 +02:00
Sergiusz Urbaniak
542bc53e2b
Cut release version 0.41.0 2020-07-30 09:36:27 +02:00
Lili Cosic
c9758cf8de
Merge pull request #3373 from lilic/port-fix 
listwatch: do not duplicate resource versions
 2020-07-29 13:24:57 +02:00
Lili Cosic
8f49757672 pkg/listwatch: Change to accept single instance of rvs 2020-07-29 11:46:06 +02:00
Michal Fojtik
7bbd81692a listwatch: do not duplicate resource versions 2020-07-29 11:45:59 +02:00
Frederic Branczyk
566b18b2c9
Merge pull request #3369 from abursavich/compat-warning 
docs: update compatibility warning
 2020-07-28 19:13:24 +02:00
Andy Bursavich
10206b05af
docs: update compatibility warning 2020-07-28 08:38:21 -07:00
Frederic Branczyk
5b35abb834
Merge pull request #3361 from dgrisonnet/fix-target-polling 
test/framework: fix prometheus active targets polling
 2020-07-28 16:55:57 +02:00
Sergiusz Urbaniak
31413b05e0
Merge pull request #3368 from paulfantom/maintenance 
OWNERS update
 2020-07-28 08:41:45 +02:00
Damien Grisonnet
fedeed921e test/e2e: split active and healthy targets polling 
Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
 2020-07-27 14:38:35 +02:00
paulfantom
514153e31a
update current maintainers file 2020-07-27 14:33:46 +02:00
Frederic Branczyk
02326ff267
Merge pull request #3365 from coreos/s-urbaniak-patch-1 
Volunteer for prometheus-operator v0.41 release
 2020-07-27 13:12:26 +02:00
Sergiusz Urbaniak
2c3619b433
Volunteer for prometheus-operator v0.41 release 2020-07-27 11:59:30 +02:00
Frederic Branczyk
f6b342d3f7
Merge pull request #3364 from coreos/revert-3308-normalize-default-durations 
Revert "Normalize default durations"
 2020-07-27 11:38:28 +02:00
Frederic Branczyk
f1e0131c1b
Merge pull request #3358 from jbfavre/fix_prometheus_version_propagation 
Propagate Prometheus image version to statefulset
 2020-07-27 11:20:16 +02:00
Frederic Branczyk
024da7b667
Fix expected default probe scrape interval 2020-07-27 10:29:46 +02:00
Frederic Branczyk
1d00eeb962
Revert "Normalize default durations" 2020-07-27 07:42:21 +02:00
Damien Grisonnet
a5f1ac95f0 test/e2e: fix bearer-token path in fs access test 
Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
 2020-07-24 16:43:54 +02:00
Damien Grisonnet
88a119cfb4 test/e2e: fix scraping path in bearer-token test 
Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
 2020-07-24 16:43:03 +02:00
Frederic Branczyk
1dc54e478f
Merge pull request #3360 from simonpasquier/instrument-resources 
pkg: instrument resources being tracked by the operator
 2020-07-24 15:26:16 +02:00
Damien Grisonnet
78696fa530 test/framework: fix prom active targets polling 
In order to check if prometheus is able to scrape a target, we are
querying the /api/v1/targets endpoint and checking if the number of
active targets is equal to the one we expect. However, active targets
displayed by the API can sometimes be unhealthy. For example, when the
scraped target responds 401 Unauthorized, the target is still considered
active but its health will be set to "down". Because of that,
unauthorized scrapes will be considered valid in the tests.

Thus, in order to verify that prometheus is allowed to scrape a target,
we also need to check if it is healthy.

Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
 2020-07-24 15:07:54 +02:00
Jean-Baptiste Favre
c710ec3e39 Fix Go gormat 2020-07-24 14:14:13 +02:00
Jean-Baptiste Favre
dc2a4527c2 Improve unit tests for Version, Tag & SHA matrix 2020-07-24 14:07:58 +02:00
Simon Pasquier
2021270248 pkg: instrument resources being tracked by the operator 
This change adds a new `prometheus_operator_resources` metric that keeps
track of the number of resources currently managed by the operator. The
metric is broken down by controller and type of resource.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2020-07-24 13:39:01 +02:00
Jean-Baptiste Favre
13aa36a8a4 Ensure image version is taken into account when using new spec.Image values 2020-07-24 09:40:35 +02:00
Frederic Branczyk
ad3571f1e2
Merge pull request #3355 from Sayrus/master 
add SecretListWatchSelector to reduce memory and CPU footprint
 2020-07-24 08:31:20 +02:00
Simon Pasquier
cbca31142f
Bump Prometheus and Thanos versions (#3356) 2020-07-23 15:39:47 +02:00
Mathis Raguin
08c18be294
prometheus/operator: rename CLI options to reflect that it's a field selector 2020-07-23 11:51:26 +02:00
Mathis Raguin
87d8b8cd47
prometheus/operator: add SecretListWatchSelector 
Signed-off-by: Mathis Raguin <mathis@cri.epita.fr>
 2020-07-22 17:13:34 +02:00
Frederic Branczyk
a821bf5d32
Merge pull request #3249 from ybettan/devel 
Added support for configuring CA, cert, and key via secret or configmap.
 2020-07-15 09:19:07 +02:00
Frederic Branczyk
fceefa4867
Merge pull request #3334 from mrueg/configmap-reload-0.4.0 
configmap-reload: Update to v0.4.0
 2020-07-15 08:18:55 +02:00
Manuel Rüger
d315a83728 configmap-reload: Update to v0.4.0 
https://github.com/jimmidyson/configmap-reload/compare/v0.3.0...v0.4.0

Signed-off-by: Manuel Rüger <manuel@rueg.eu>
 2020-07-14 11:26:23 +02:00
Paweł Krupa
4b9a8cc9eb
Merge pull request #3332 from sfiera/mod 
go.mod: remove “replace” for client-go dep
 2020-07-14 09:52:31 +02:00
Chris Pickel
0b6f48bb88 go.mod: remove “replace” for client-go dep 
A normal require directive [now?] works just as well, but the replace
directive forces dependents to also add a replace.

Note that client-go has been updated from v0.18.2 to v0.18.3. I didn’t
check which dependency requires this, but other k8s deps (api and
apimachinery) are already v0.18.3, and as vendor/ shows, the changes are
minimal (adding a default server where one did not previously exist).
 2020-07-14 11:52:22 +09:00
Frederic Branczyk
40f86986dd
Merge pull request #3319 from 0robustus1/support-alertmanager-reload-on-configmap-change 
reload alertmanager on configmap/secret change
 2020-07-13 14:03:13 +02:00
Tim Reddehase
ff90c434ea
add test for additional secrets AM config reload. 
Signed-off-by: Tim Reddehase <tim.reddehase@new-work.se>
 2020-07-13 08:40:52 +02:00
Yoni Bettan
be0bf2fc26 Added support for configuring RemoteWrite TLS via Secret or Configmap. 
Now we can configure the operator to use mTLS RemoteWrite by referencing
the CA, cert and key directly from k8s Secrets/ConfigMaps.

If the key and the cert are both Secrets, they can exist as a single
Secret which contain both 'cert.pem' and 'key.pem' otherwise they can
exist as 2 different Secrets (or a Secret for the key and ConfigMap for
the cert).

Signed-off-by: Yoni Bettan <ybettan@redhat.com>
 2020-07-12 14:42:17 +03:00
Paul Gier
f9ec09cb0e
Merge pull request #3103 from pgier/ensure-consistent-image-override-behaviour 
consolidate image url logic
 2020-07-10 08:56:28 -05:00
Tim Reddehase
f41d4c87cd
use prometheus metric parser to get config reload value. 
Signed-off-by: Tim Reddehase <tim.reddehase@new-work.se>
 2020-07-10 15:43:59 +02:00
Tim Reddehase
db97d0c3ed
add test for alertmanager reload based on configmap. 
Signed-off-by: Tim Reddehase <tim.reddehase@new-work.se>
 2020-07-10 15:43:43 +02:00
Paul Gier
461cfbf5a9 improve CLI arg help for default images 2020-07-09 17:53:22 -05:00
Paul Gier
c0fcbc4b76 update generated files for examples and docs 2020-07-09 17:53:22 -05:00
Paul Gier
b52ae3183f deprecate baseImage, tag, and SHA fields 
Updates the API documentation to indicate that these fields are now
deprecated in the Alertmanager and Prometheus custom resources.
 2020-07-09 17:53:22 -05:00
Paul Gier
a5c0ba61c4 pkg/operator: consolidate image url logic 
Move logic for building image URLs into the operator package.
This improves the consistency for building image URLs from the
combination of default settings, operator CLI args, and config in the
custom resources.
 2020-07-09 17:53:18 -05:00