From b2baa2fdd572fd93574896037f1e12d1b407aec8 Mon Sep 17 00:00:00 2001
From: Benjamin Fuller <Benjamintf1@gmail.com>
Date: Wed, 10 Apr 2019 15:52:46 -0600
Subject: [PATCH] Add optional namespace restriction to prometheus input plugin
 (#5697)

---
 plugins/inputs/prometheus/README.md     | 5 +++++
 plugins/inputs/prometheus/kubernetes.go | 2 +-
 plugins/inputs/prometheus/prometheus.go | 6 +++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/prometheus/README.md b/plugins/inputs/prometheus/README.md
index 9208f54be..c1f50bb96 100644
--- a/plugins/inputs/prometheus/README.md
+++ b/plugins/inputs/prometheus/README.md
@@ -24,6 +24,9 @@ in Prometheus format.
   ## - prometheus.io/path: If the metrics path is not /metrics, define it with this annotation.
   ## - prometheus.io/port: If port is not 9102 use this annotation
   # monitor_kubernetes_pods = true
+  ## Restricts Kubernetes monitoring to a single namespace
+  ##   ex: monitor_kubernetes_pods_namespace = "default"
+  # monitor_kubernetes_pods_namespace = ""
 
   ## Use bearer token for authorization. ('bearer_token' takes priority)
   # bearer_token = "/path/to/bearer/token"
@@ -64,6 +67,8 @@ Currently the following annotation are supported:
 * `prometheus.io/path` Override the path for the metrics endpoint on the service. (default '/metrics')
 * `prometheus.io/port` Used to override the port. (default 9102)
 
+Using the `monitor_kubernetes_pods_namespace` option allows you to limit which pods you are scraping.
+
 #### Bearer Token
 
 If set, the file specified by the `bearer_token` parameter will be read on
diff --git a/plugins/inputs/prometheus/kubernetes.go b/plugins/inputs/prometheus/kubernetes.go
index 0d86ad91e..d92d90ead 100644
--- a/plugins/inputs/prometheus/kubernetes.go
+++ b/plugins/inputs/prometheus/kubernetes.go
@@ -83,7 +83,7 @@ func (p *Prometheus) start(ctx context.Context) error {
 // directed to do so by K8s.
 func (p *Prometheus) watch(ctx context.Context, client *k8s.Client) error {
 	pod := &corev1.Pod{}
-	watcher, err := client.Watch(ctx, "", &corev1.Pod{})
+	watcher, err := client.Watch(ctx, p.PodNamespace, &corev1.Pod{})
 	if err != nil {
 		return err
 	}
diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
index 879af4567..a4409c5b0 100644
--- a/plugins/inputs/prometheus/prometheus.go
+++ b/plugins/inputs/prometheus/prometheus.go
@@ -41,7 +41,8 @@ type Prometheus struct {
 	client *http.Client
 
 	// Should we scrape Kubernetes services for prometheus annotations
-	MonitorPods    bool `toml:"monitor_kubernetes_pods"`
+	MonitorPods    bool   `toml:"monitor_kubernetes_pods"`
+	PodNamespace   string `toml:"monitor_kubernetes_pods_namespace"`
 	lock           sync.Mutex
 	kubernetesPods map[string]URLAndAddress
 	cancel         context.CancelFunc
@@ -65,6 +66,9 @@ var sampleConfig = `
   ## - prometheus.io/path: If the metrics path is not /metrics, define it with this annotation.
   ## - prometheus.io/port: If port is not 9102 use this annotation
   # monitor_kubernetes_pods = true
+  ## Restricts Kubernetes monitoring to a single namespace
+  ##   ex: monitor_kubernetes_pods_namespace = "default"
+  # monitor_kubernetes_pods_namespace = ""
 
   ## Use bearer token for authorization. ('bearer_token' takes priority)
   # bearer_token = "/path/to/bearer/token"