Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304160
Change subject: prometheus: Use 4sp indent rather than 2sp
......................................................................
prometheus: Use 4sp indent rather than 2sp
Change-Id: I48da9a257f6d5866d0bd7ce1bf4d103c860042eb
---
M modules/role/manifests/prometheus/tools.pp
1 file changed, 28 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/304160/1
diff --git a/modules/role/manifests/prometheus/tools.pp
b/modules/role/manifests/prometheus/tools.pp
index f254ba3..a0ab1c9 100644
--- a/modules/role/manifests/prometheus/tools.pp
+++ b/modules/role/manifests/prometheus/tools.pp
@@ -11,34 +11,34 @@
prometheus::server { 'tools':
listen_address => '127.0.0.1:9902',
scrape_configs_extra => [
- {
- 'job_name' => 'k8s',
- 'bearer_token_file' => $bearer_token_file,
- 'kubernetes_sd_configs' => [
- {
- 'api_servers' => [ "https://${master_host}:6443"; ],
- 'bearer_token_file' => $bearer_token_file,
- },
- ],
- # keep metrics coming from apiserver or node kubernetes roles
- # and map kubernetes node labels to prometheus metric labels
- 'relabel_configs' => [
- {
- 'source_labels' => ['__meta_kubernetes_role'],
- 'action' => 'keep',
- 'regex' => '(?:apiserver|node)',
- },
- {
- 'action' => 'labelmap',
- 'regex' => '__meta_kubernetes_node_label_(.+)',
- },
- {
- 'source_labels' => ['__meta_kubernetes_role'],
- 'action' => 'replace',
- 'target_label' => 'kubernetes_role',
- },
- ]
- }
+ {
+ 'job_name' => 'k8s',
+ 'bearer_token_file' => $bearer_token_file,
+ 'kubernetes_sd_configs' => [
+ {
+ 'api_servers' => [ "https://${master_host}:6443";
],
+ 'bearer_token_file' => $bearer_token_file,
+ },
+ ],
+ # keep metrics coming from apiserver or node kubernetes
roles
+ # and map kubernetes node labels to prometheus metric
labels
+ 'relabel_configs' => [
+ {
+ 'source_labels' => ['__meta_kubernetes_role'],
+ 'action' => 'keep',
+ 'regex' => '(?:apiserver|node)',
+ },
+ {
+ 'action' => 'labelmap',
+ 'regex' => '__meta_kubernetes_node_label_(.+)',
+ },
+ {
+ 'source_labels' => ['__meta_kubernetes_role'],
+ 'action' => 'replace',
+ 'target_label' => 'kubernetes_role',
+ },
+ ]
+ }
]
}
--
To view, visit https://gerrit.wikimedia.org/r/304160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48da9a257f6d5866d0bd7ce1bf4d103c860042eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
