puppetdb: handle cases when targets or labels are empty

Author: yann-soubeyrand

go.mod

@@ -35,3 +35,5 @@ require (
 	k8s.io/client-go v0.0.0-20190325145348-5392b64e5c0b
 	k8s.io/kube-openapi v0.0.0-20190502190224-411b2483e503 // indirect
 )
+
+go 1.13

internal/puppetdb/puppetdb.go

@@ -101,6 +101,14 @@ func (p *PuppetDB) GetScrapeConfigs(cfg *config.PrometheusSDConfig) (scrapeConfi
 		targets := parameters.Targets
 		labels := parameters.Labels
 
+		if targets == nil {
+			continue
+		}
+
+		if labels == nil {
+			labels = map[string]string{}
+		}
+
 		scrapeConfig, ok := scrapeConfigMap[jobName]
 		if !ok {
 			scrapeConfig = &types.ScrapeConfig{

internal/puppetdb/puppetdb_test.go

@@ -55,6 +55,21 @@ var fakeResponse = `
 				"team": "team-1"
 			}
 		}
+	},
+	{
+		"certname": "server-3.example.com",
+		"parameters": {
+			"job_name": "node-exporter",
+			"targets": [
+				"server-3.example.com:9100"
+			]
+		}
+	},
+	{
+		"certname": "server-4.example.com",
+		"parameters": {
+			"job_name": "node-exporter"
+		}
 	}
 ]
 `
@@ -210,6 +225,21 @@ func TestGetResources(t *testing.T) {
 				},
 			},
 		},
+		{
+			Certname: "server-3.example.com",
+			Parameters: types.Parameters{
+				JobName: "node-exporter",
+				Targets: []string{
+					"server-3.example.com:9100",
+				},
+			},
+		},
+		{
+			Certname: "server-4.example.com",
+			Parameters: types.Parameters{
+				JobName: "node-exporter",
+			},
+		},
 	}
 
 	// Mock http server
@@ -266,6 +296,14 @@ func TestGetScrapeConfigs(t *testing.T) {
 						"team":        "team-1",
 					},
 				},
+				{
+					Targets: []string{
+						"server-3.example.com:9100",
+					},
+					Labels: map[string]string{
+						"certname": "server-3.example.com",
+					},
+				},
 			},
 		},
 		{

prometheus-puppetdb-sd.1

@@ -1,4 +1,4 @@
-.TH prometheus-puppetdb-sd 1 "7 August 2019"
+.TH prometheus-puppetdb-sd 1 "16 September 2019"
 .SH NAME
 prometheus-puppetdb-sd \- PuppetDB based service discovery for Prometheus
 .SH SYNOPSIS