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
1933 commits 97 branches 309 tags 260 MiB
Commit graph

1933 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tamal Saha
39306eb830 Update client libraries to Kubernetes 1.11 2018-07-01 09:23:00 -07:00
Ali Rizwan
cbc69a4d34 Fix prometheus chart for ruleNamespaceSelector (#1553) 
* Fix prometheus chart for ruleNamespaceSelector
 2018-06-29 15:50:29 +02:00
Frederic Branczyk
0d953df574
Merge pull request #1546 from brancz/grafana-secrets 
kube-prometheus: Re-generate Grafana jsonnet dependency
 2018-06-29 10:50:36 +02:00
Frederic Branczyk
5350c812a7
kube-prometheus: Re-generate Grafana jsonnet dependency 2018-06-28 17:31:58 +02:00
danielcb
5dee4320ae Use correct feature flag for additionalAlertManagerConfigs option (#1537) 
* Use correct feature flag for additionalAlertManagerConfigs option
 2018-06-28 17:00:13 +02:00
Frederic Branczyk
e33cb65b5a
Merge pull request #1545 from osela/rules-doc-link-fixes 
docs: fix missing and broken links
 2018-06-28 16:44:43 +02:00
Or Sela
5e241e8771 Fix missing and broken links in developing-prometheus-rules-and-grafana-dashboards doc 2018-06-28 17:37:32 +03:00
Frederic Branczyk
49d77c2a41
Merge pull request #1512 from jdoupe/remove-serviceMonitorSelector-from-kube-prometheus 
kube-prometheus: Remove default serviceMonitorsSelector
 2018-06-28 16:35:06 +02:00
Frederic Branczyk
f70555316c
Merge pull request #1542 from brancz/regenerate-dashboards 
kube-prometheus: Re-generate dashboards
 2018-06-28 16:13:06 +02:00
Jeremy Doupe
e5b6514f3e kube-prometheus: Remove default serviceMonitorsSelector 2018-06-28 08:59:15 -05:00
Frederic Branczyk
ef4ca9f404
kube-prometheus: Re-generate dashboards 2018-06-28 13:44:51 +02:00
Frederic Branczyk
79fbe4641c
Merge pull request #1541 from brancz/cut-0.21.0 
Cut 0.21.0
 2018-06-28 12:42:55 +02:00
Ali Rizwan
73f277b39d Added ruleNamespaceSelector to kube-prometheus and prometheus charts. (#1540) 
* Added ruleNamespaceSelector to kube-prometheus and prometheus helm charts.

* Update requirements.yaml
 2018-06-28 11:49:01 +02:00
Frederic Branczyk
ff20f263a3
CHANGELOG.md: Add v0.21.0 entry 2018-06-28 11:48:11 +02:00
Frederic Branczyk
09ef916a99
*: Bump version to v0.21.0 2018-06-28 11:40:53 +02:00
Moiz Virani
047de96d1a kube-prometheus: Making kubelets, kubescheduler, kube controller and kube state exporters optional (#1525) 
* Helm: Improving readme instructions for testing helm chart locally

Adding note about where to run commands from and also breaking up large bash commands into multiple lines for simple copy paste.

* kube-prometheus: Making kubelets, kubescheduler, kube controller and kube state exporters optional

When running prometheus operator on hosted kuberenetes like GCE, few of the exporters are optional, so adding ability to conditional installations.

Fixes #1001, #355, #845

* Update Chart.yaml

* Update Chart.yaml
 2018-06-28 01:41:27 +02:00
Steve Durrheimer
d7ca8a8598 Add sidecar containers field to Prometheus Helm chart (#1485) 
* helm/prometheus: Add prometheus labels to prometheus podMetadata labels

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>

* helm/prometheus: Add sidecarsSpec field

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>

* Update Chart.yaml
 2018-06-27 22:14:34 +02:00
Frederic Branczyk
39fe3f673a
Merge pull request #1524 from mxinden/make-folder 
kube-prometheus/Makefile: Change target output from files to folder
 2018-06-27 11:43:49 +02:00
Frederic Branczyk
4b14266518
Merge pull request #1536 from brancz/regenerate 
kube-prometheus: Regenerate prometheus CRD
 2018-06-27 11:42:31 +02:00
Frederic Branczyk
2741a7cb09
Merge branch 'master' into make-folder 2018-06-27 11:34:06 +02:00
Frederic Branczyk
a43cad27ef
Merge pull request #1534 from mxinden/bump-versions 
versions: Bump Prometheus and Alertmanager version to 2.3.1 and 0.15.0
 2018-06-27 11:28:35 +02:00
Frederic Branczyk
90f65cc82e
kube-prometheus: Regenerate prometheus CRD 2018-06-27 10:24:33 +02:00
Max Leonard Inden
fc8990465f
versions: Bump Prometheus and Alertmanager version to 2.3.1 and 0.15.0 2018-06-27 14:13:00 +08:00
Frederic Branczyk
24f98e7df9 Remote write queue config (#1517) 
RemoteWriteSpec Expose QueueConfig Parameters (#1488)
 2018-06-26 22:03:02 +08:00
Frederic Branczyk
f9bc0aa0fd
Merge pull request #1521 from brancz/bump-versions 
kube-prometheus: Bump various versions
 2018-06-26 15:19:57 +02:00
Max Leonard Inden
6f79b72e5b
kube-prometheus/Makefile: Change target output from files to folder 
Previously the `manifests` and `vendor` folder content has been build
via `manifests/**` and `vendor/**` target definitions. This results in
two issues:

1. The GNU Make recipe is executed for every single file in the folders.

2. Not all timestamps inside the `manifests` folder would be updated on
every run, thereby needing to be rerun on all following target
executions.

Solution:

1. Define the target based on the folder, not individual files

2. Remove target folder before execution recipe to ensure all timestamps
are updated.
 2018-06-26 00:08:30 +08:00
Frederic Branczyk
b0a8b24cb6
kube-prometheus: Bump various versions 2018-06-25 13:48:36 +02:00
Frederic Branczyk
2ef66dc908
Merge pull request #1492 from brancz/thanos 
*: Add Thanos integration
 2018-06-25 09:07:54 +02:00
Frederic Branczyk
84350d2c56
*: Add Thanos integration 2018-06-22 15:49:02 +02:00
Frederic Branczyk
0915be1d62
Merge pull request #1508 from cofyc/bugfix 
bugfix: return on error
 2018-06-21 13:58:26 +02:00
Yecheng Fu
5e576db3a6 bugfix: return on error and fix TestStatefulSetVolumeInitial 2018-06-21 09:49:16 +08:00
Frederic Branczyk
a51fadb303
Merge pull request #1499 from brancz/fix-image-push 
scripts: Ensure container image repo variable is set
 2018-06-18 18:25:41 +02:00
Frederic Branczyk
7ea2a72522
scripts: Ensure container image repo variable is set 2018-06-18 17:42:14 +02:00
Frederic Branczyk
553e6e096f
Merge pull request #1497 from brancz/dashboard-ids 
kube-prometheus: Update kubernetes monitoring mixing
 2018-06-18 15:55:07 +02:00
Frederic Branczyk
1505a8a16b
kube-prometheus: Update kubernetes monitoring mixing 2018-06-18 14:28:19 +02:00
Frederic Branczyk
4a08d440ee
Merge pull request #1491 from mxinden/fix-push-image 
travis: Update travis-push-docker-image.sh to new build system
 2018-06-15 18:35:41 +02:00
Max Leonard Inden
e8a689d62e
travis: Update travis-push-docker-image.sh to new build system 2018-06-15 17:19:32 +02:00
Alice
cab34d7fe1 add additionalAlertManagerConfigs to helm chart (#1457) 
* add additionalAlertManagerConfigs to helm chart

This should help Helm users take advantage of the flexibility of the
additionalAlertManagerConfigs field added to PrometheusSpec.

Fixes #1456

* add additionalAlertManagerConfigs example to helm chart
 2018-06-15 14:54:33 +02:00
Max Inden
97bcd7df40
Merge pull request #1484 from mxinden/node-exporter-host-port 
kube-prometheus: Run node-exporter in host network
 2018-06-15 13:37:26 +02:00
Max Leonard Inden
f7a7a17e70
kube-prometheus: Run node-exporter in host network 
Node exporter needs to run in the host network, not in the pod network
in order to pick up network metrics of the node.
 2018-06-15 11:47:51 +02:00
Frederic Branczyk
cf48cc3ed3
Merge pull request #1486 from brancz/update-grafana 
kube-prometheus: Update grafana jsonnet dependency
 2018-06-15 11:16:33 +02:00
Frederic Branczyk
f7feaf047c
kube-prometheus: Update grafana jsonnet dependency 2018-06-14 18:57:00 +02:00
Frederic Branczyk
74615f89ac
Merge pull request #1483 from sichvoge/remove-roadmap-reference 
docs: Removed reference to ROADMAP.md file
 2018-06-14 15:51:31 +02:00
Christian Vogel
33cc6f29f2 docs: Removed reference to ROADMAP.md file 
With PR #1481, I removed the ROADMAP.md file but did not delete the reference
to that file inside the README.md. This commit fixes that.
 2018-06-14 13:04:48 +02:00
Ismail Kaboubi
e261501a36 docs: Improve ServiceMonitor namespace relation documentation (#1468) 
ServiceMonitors must be installed in the same namespace as the Prometheus, if ServiceMonitorNamespaceSelector is not specified.
 2018-06-14 09:33:24 +02:00
Frederic Branczyk
4fac63a25b
Merge pull request #1469 from mxinden/version-ldflag 
pkg/version: Pass Prometheus Operator version via ldflags
 2018-06-13 15:27:37 +02:00
Frederic Branczyk
1b3103603a
Merge pull request #1481 from sichvoge/delete-file 
removed ROADMAP.md
 2018-06-13 15:26:57 +02:00
Christian Vogel
e6b12b2e18 removed ROADMAP.md 
As discussed with Frederic, the ROADMAP file is from the early days and not
necessary anymore. We agreed to remove it from this repo.
 2018-06-13 14:13:22 +02:00
Frederic Branczyk
b56988c301
Merge pull request #1480 from sichvoge/fix-docs-prometheusrules 
docs: renamed RuleFile to PrometheusRule and ruleFileSelector to ruleSelector
 2018-06-13 13:45:23 +02:00
Max Leonard Inden
a169f102ec
pkg/version: Pass Prometheus Operator version via ldflags 
The Prometheus config reloader image is released along with the
Prometheus Operator image, tagged with the same semver version. In order
to default to the Prometheus Operator version if no Prometheus config
reloader image is specified, the content of `VERSION` needs to be passed
during compile time.

In addition with both the Prometheus Operator and the Prometheus Config
Reloader being aware of their version, we can log it at process startup
time.
 2018-06-13 12:19:48 +02:00