34 Commits (03a9e7f72e072c6d29f422425d8acd91a957836b)

Author	SHA1	Message	Date
Bartek Plotka	03a9e7f72e	example: Commented out annotation examples as they are meant only for example not as an idiomatic way of relabelling. ... Signed-off-by: Bartek Plotka <bwplotka@gmail.com>	7 years ago
Paul Gier	85a3c974b7	minor yaml indentation consistency fix in example configs (#3946)	7 years ago
Johannes 'fish' Ziemke	70f3d1e9f9	k8s: Support discovery of ingresses (#3111) ... * k8s: Support discovery of ingresses * Move additional labels below allocation This makes it more obvious why the additional elements are allocated. Also fix allocation for node where we only set a single label. * k8s: Remove port from ingress discovery * k8s: Add comment to ingress discovery example	7 years ago
Felicity	f30b10223a	documentation: update Kubernetes example for 1.7 (#2918) ... Kubernetes 1.7+ no longer exposes cAdvisor metrics on the Kubelet metrics endpoint. Update the example configuration to scrape cAdvisor in addition to Kubelet. The provided configuration works for 1.7.3+ and commented notes are given for 1.7.2 and earlier versions. Also remove the comment about node (Kubelet) CA not matching the master CA. Since the example no longer connects directly to the nodes, it doesn't matter what CA they're using. References: - https://github.com/kubernetes/kubernetes/issues/48483 - https://github.com/kubernetes/kubernetes/pull/49079	7 years ago
Jorrit Salverda	14d0604aba	Kubernetes config scrape node via api proxy (#2641) ... * scrape kubelet metrics via api node proxy * add manifests to setup serviceaccount, clusterrole and clusterrolebinding to work with rbac * removed .cluster.local and added newline to address comments	8 years ago
Svend Sorensen	94a3e863e4	Document what ports are scraped by default in k8s example ... The Kubernetes pod SD creates a target for each declared port, as documented: https://prometheus.io/docs/operating/configuration/#pod > The pod role discovers all pods and exposes their containers as targets. For > each declared port of a container, a single target is generated. If a > container has no specified ports, a port-free target per container is created > for manually adding a port via relabeling. This results in the default port being the declared port, or no port if none are declared.	8 years ago
Stephen Soltesz	3f29324e04	Fix kubernetes host:port relabel regex. ... This change corrects a bug introduced by PR https://github.com/prometheus/prometheus/pull/2427 The regex uses three groups: the hostname, an optional port, and the prefered port from a kubernetes annotation. Previously, the second group should have been ignored if a :port was not present in the input. However, making the port group optional with the "?" had the unintended side-effect of allowing the hostname regex "(.+)" to match greedily, which included the ":port" patterns up to the ";" separating the hostname from the kubernetes port annotation. This change updates the regex for the hostname to match any non-":" characters. This forces the regex to stop if a ":port" is present and allow the second group to match the optional port.	8 years ago
Stephen Soltesz	0b1790ee44	Match addresses with or without declared ports. ... This change updates port relabeling for pod and service discovery so the relabeling regex matches addresses with or without declared ports. As well, this change uses a consistent style in the replacement pattern for the two expressions. Previously, for both services or pods that did not have declared ports, the relabel config regex would fail to match: __meta_kubernetes_service_annotation_prometheus_io_port regex: (.+)(?::\d+);(\d+) __meta_kubernetes_pod_annotation_prometheus_io_port regex: (.+):(?:\d+);(\d+) Both regexes expected a <host>:<port> pattern. The new regex matches addresses with or without declared ports by making the :<port> pattern optional. __meta_kubernetes_service_annotation_prometheus_io_port __meta_kubernetes_pod_annotation_prometheus_io_port regex: (.+)(?::\d+)?;(\d+)	8 years ago
Svend Sorensen	3a96d0e267	Kubernetes SD: Fix namespace meta label ... Replace one more instance of `__meta_kubernetes_service_namespace` with `__meta_kubernetes_namespace`.	8 years ago
beorn7	5770d9e545	Kubernetes SD: More fixes to example config ... - Avoid mentioning the `in_cluster` option. (It doesn't exist anymore.) - Replace `__meta_kubernetes_service_namespace` and `__meta_kubernetes_pod_namespace` (which don't exist anymore) by `__meta_kubernetes_namespace`.	8 years ago
Jimmi Dyson	473dd5b89a	Kubernetes SD: Add endpoints role to API servers job to actually discover some API servers	8 years ago
Jimmi Dyson	da23543f29	Kubernetes SD: Update example config to use endpoints role for API server discovery	8 years ago
Jimmi Dyson	4d37dca669	Kubernetes SD: Update config for discovery in 1.3	8 years ago
Audun Fauchald Strand	50e044bb00	added path to pods scrape job	8 years ago
William Stewart	f97cd29e47	Drop '__meta_kubernetes_role' since we have role in the config	8 years ago
William Stewart	599fafd2aa	Add node job	8 years ago
William Martin Stewart	58a3771e49	Add roles to prometheus kubernetes example ... Needed with Prometheus 1.0	8 years ago
Jimmi Dyson	5733de0dfe	Kubernetes SD: Update example config with TLS options	9 years ago
Pieter Lange	427b322078	Minor typo	9 years ago
Patrick Bogen	ae413704e8	kubernetes pod-level discovery	9 years ago
Jimmi Dyson	d3934345e9	Kubernetes Discovery: Ensure metrics path isn't overwritten in example relabeling	9 years ago
Jimmi Dyson	c12fb447b8	Kubernetes SD: Use first TCP service port as target port & clean up ... example config Fixes #1256	9 years ago
Jimmi Dyson	042f18b07a	Kubernetes SD: Fix metrics path relabeling in example config	9 years ago
Jimmi Dyson	645feba8cf	KubernetesSD: Remove redundant defaults from example config	9 years ago
Jimmi Dyson	2cca07381b	KubernetesSD: Create targets for services as well as service endpoints	9 years ago
Jimmi Dyson	104803e74e	Kubernetes SD: Cleanup example config label regexps	9 years ago
Jimmi Dyson	87940ec213	Kubernetes SD: Rename `masters` to `api_servers` in config	9 years ago
Jimmi Dyson	1976dfe634	Add Kubernetes namespace & name labels to example config	9 years ago
Jimmi Dyson	0d61605526	Kubernetes SD example: separate out cluster level components & services	9 years ago
Jimmi Dyson	e26fc5e73c	Kubernetes SD config tidy & add labelmap action example	9 years ago
Keegan Carruthers-Smith	e633b1dc8d	Move InCluster auth in kubernetes example config ... CA and Bearer Token are config of `kubernetes_sd_configs`, not the `scrape_config`. Also updated misleading top-level comment and removed unnecessary global config.	9 years ago
Jimmi Dyson	a1574aa2b3	Move TLS options to scrape config ... Fixes #1013, fixes #989	9 years ago
Jimmi Dyson	d7a7fd4589	Kubernetes SD improvements ... * Support multiple masters with retries against each master as required. * Scrape masters' metrics. * Add role meta label for node/service/master to make it easier for relabeling.	9 years ago
Jimmi Dyson	923f8111d4	Initial Kubernetes discovery ... Fixes #904	9 years ago