easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91 Commits 19 Branches 14 Tags
3a38e173f9a09f27d3a5a59c0cbd59ff8c671ba8
Commit Graph

91 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frederic Branczyk
3a38e173f9 Merge pull request #40 from tsloughter/master 
upgrade grafana image to 4.1.1
 2017-02-17 15:38:09 +01:00
Tristan Sloughter
8dcf5ced22 upgrade grafana image to 4.1.1 2017-02-16 12:23:02 -08:00
Fabian Reinartz
dee7f834fb Merge pull request #28 from brancz/hide-expected-errors 
hack/cluster-monitoring: hide expected errors and print meaning
 2017-01-04 14:55:08 +01:00
Frederic Branczyk
a468d489d6 hack/cluster-monitoring: hide expected errors and print meaning 2017-01-03 14:42:44 +01:00
Frederic Branczyk
b5259148a1 Merge pull request #27 from brancz/kubectl-apply 
hack/*: use kubectl apply where possible
 2017-01-03 13:30:15 +01:00
Frederic Branczyk
9e319acaa9 hack/*: use kubectl apply where possible 
There is an issue with kubectl apply and third party resources, so for
the time being we use create for TPRs, but apply for all manifests that
it can handle.
 2017-01-03 13:22:40 +01:00
Frederic Branczyk
0efaf385eb Merge pull request #26 from chancez/fix_hack_deploy_kubeconfig 
Don't pass $KUBECONFIG to kubectl --kubeconfig flag
 2017-01-02 09:09:08 +01:00
Chance Zibolski
c845c3c96b Don't pass $KUBECONFIG to kubectl --kubeconfig flag 
The $KUBECONFIG variable is like $PATH, and supports multiple files
separated by `:`, but --kubeconfig only takes a single file as a value.
Since kubectl picks up the $KUBECONFIG variable already, don't pass it
to kubectl.

Also, use --namespace instead of -n to support older kubectl versions.
 2016-12-30 11:39:25 -08:00
Fabian Reinartz
70ab7eb29e Merge pull request #25 from brancz/cleanup 
*: cleanup and unify minikube and self-hosted discovery
 2016-12-24 10:18:29 +01:00
Frederic Branczyk
a200051578 *: cleanup and unify minikube and self-hosted discovery 2016-12-23 20:06:32 +01:00
Frederic Branczyk
7516052da2 Merge pull request #22 from brancz/update-configs 
Update configs/alerts
 2016-12-14 18:17:05 -08:00
Frederic Branczyk
dca2c152cf assets: adapt to recent changes 
Recently the ConfigMap for the prometheus config was changed, but not in
the assets, where it should have happened.
 2016-12-14 18:13:28 -08:00
Frederic Branczyk
1c6bc7a387 kubernetes alerts: don't alert on multiple 
bootkube starts two replicas of the scheduler and controllers manager
 2016-12-14 18:10:50 -08:00
Frederic Branczyk
417e3feb4b Merge pull request #19 from brancz/v0.1.0-fixes 
correctly discover the Alertmanager cluster and ServiceMonitors
 2016-12-12 23:07:18 -08:00
Frederic Branczyk
b867f6c9ec correctly discover the Alertmanager cluster and ServiceMonitors 2016-12-12 23:01:30 -08:00
Fabian Reinartz
3c8df35189 Merge pull request #18 from brancz/operator-v0.1.0 
use prometheus-operator v0.1.0
 2016-12-13 05:46:05 +01:00
Frederic Branczyk
0faefbb713 use prometheus-operator v0.1.0 
v0.1.0 introduced handling Alertmanager clusters.
 2016-12-12 20:43:36 -08:00
Frederic Branczyk
1b72c350bc Merge pull request #17 from bernielomax/bernielomax/fix-invalid-tag 
Fixed docker image tag for "quay.io/prometheus/node-exporter".
 2016-12-11 19:53:47 -08:00
Justin Pye
c35ec6f5e2 The tag did not exist for "prometheus/node-exporter". So I have changed it to a valid value of "v0.13.0" 2016-12-12 13:11:22 +10:00
Fabian Reinartz
dda5b0cc80 Merge pull request #16 from brancz/default-resources 
Update manifests to latest version of Prometheus Operator
 2016-12-10 10:09:55 +01:00
Frederic Branczyk
cbf8673094 manifests/exporters: update node-exporter version 2016-12-09 17:09:06 -08:00
Frederic Branczyk
a40ca507c6 manifests/k8s: add service for discovering kube-dns metrics 
The ports reflect the upstream kube-dns manifests of bootkube and
kubernetes/kubernetes.
 2016-12-02 14:13:35 +01:00
Frederic Branczyk
d0c1fb522b manifests: add Alertmanager manifests and discovery 
The latest version of the Prometheus Operator requires Prometheus
>=v1.4.0 for the Alertmanger discovery feature.
 2016-12-02 14:12:30 +01:00
Frederic Branczyk
0c1bb5c1c9 manifests: remove prometheus.io/scrape annotations 
These annotations made sense in pre v1.3.0 Prometheus releases, however,
with >=v1.3.0 and the Prometheus Operator these annotations are more
confusing then helpful.
 2016-12-02 14:10:53 +01:00
Frederic Branczyk
20f88eed10 *: set lower resource requests 2016-12-02 14:08:14 +01:00
Frederic Branczyk
9f7b21737e Merge pull request #15 from mrwacky42/patch-1 
Spleling
 2016-11-21 14:48:27 +01:00
Sharif Nassar
0c2d5875d4 Spleling 2016-11-18 16:11:25 -08:00
Fabian Reinartz
b84a3650a5 Add JSON wrapping 2016-11-04 14:25:59 -07:00
Fabian Reinartz
b7e58668df Fix deployment dashboard 2016-11-04 13:34:08 -07:00
Fabian Reinartz
a80bf28a57 Resize gauges in node dashboards 2016-11-04 13:07:18 -07:00
Fabian Reinartz
e367cfa907 Merge branch 'master' of github.com:coreos/kube-prometheus 2016-11-04 13:04:51 -07:00
Fabian Reinartz
73b8e9689d Improve deployment dashboard 2016-11-04 13:04:34 -07:00
Frederic Branczyk
add3f250e7 Merge pull request #13 from grobie/grobie/fix-kubernetes-rules 
Fix broken kubernetes.rules
 2016-11-04 13:46:17 +01:00
Tobias Schmidt
99ef2bfe5f Fix broken kubernetes.rules 2016-11-04 08:41:35 -04:00
Frederic Branczyk
cd1457b356 Merge pull request #11 from coreos/fabxc-patch-1 
Fix always firing alerts
 2016-11-04 11:11:03 +01:00
Fabian Reinartz
4db59342f2 Merge pull request #8 from grobie/scrape-prometheus 
Scrape Prometheus service itself
 2016-11-03 18:33:38 -07:00
Fabian Reinartz
b8eb771b1a Fix always firing alerts 2016-11-03 18:30:19 -07:00
Tobias Schmidt
0c18531aeb Scrape Prometheus service itself 2016-11-03 20:46:04 -04:00
Fabian Reinartz
ec79cbcbda Replace node dashboards 
This replaces the cluster overview dashboards with new dashboards
for a cluster-wide overview and inspecting single nodes.
 2016-11-03 13:57:39 -07:00
Frederic Branczyk
e360f1963d Merge pull request #6 from grobie/prometheus-config-asset 
Extract prometheus.yaml into assets
 2016-11-03 16:06:07 +01:00
Tobias Schmidt
0613e00dcc Extract prometheus.yaml into assets 
It's a lot easier to show and explain the Prometheus config if available
in the standard yaml format. The Kubernetes ConfigMap specs can always
be auto-generated.
 2016-11-03 11:03:48 -04:00
Fabian Reinartz
d3ba116f71 Attribute SoundCloud as author of rules 2016-11-02 21:25:58 -07:00
Fabian Reinartz
d0602263c4 Fix README 2016-11-02 21:21:45 -07:00
Fabian Reinartz
043131a77c Fix example-app manifests 2016-11-02 10:17:56 -07:00
Frederic Branczyk
cd4941eba4 mention minikube restrictions 2016-11-02 16:34:28 +01:00
Fabian Reinartz
07a64fba11 Merge pull request #5 from brancz/prerequisites-docs 
add explanation and guide on prerequisites
 2016-11-02 07:15:13 -07:00
Fabian Reinartz
35098b6a1b Update README.md 2016-11-02 07:14:21 -07:00
Frederic Branczyk
7cb9eff923 add explanation and guide on prerequisites 2016-11-02 14:12:43 +01:00
Frederic Branczyk
5291bc3227 Merge pull request #4 from brancz/etcd2-alerts 
add etcd2 alerts
 2016-11-02 11:14:18 +01:00
Frederic Branczyk
2e5bcc1671 add etcd2 alerts 2016-11-02 11:03:13 +01:00