Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add scraping for Prometheus endpoint in Kubernetes #4920

Merged
merged 16 commits into from
Nov 5, 2018
Merged

Add scraping for Prometheus endpoint in Kubernetes #4920

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8d1a552
Add scraping for Prometheus endpoint in Kubernetes
Mar 16, 2018
7cdc0e7
fixup! Add scraping for Prometheus endpoint in Kubernetes
Apr 30, 2018
3dff47f
Start addressing feedback and requested changes
glinton Oct 8, 2018
d7eb1b1
Merge branch 'master' into sorenmat_promethus_scan
glinton Oct 10, 2018
43eaf99
Continue implementing suggested changes
glinton Oct 24, 2018
0a1358e
Merge branch 'master' into sorenmat_promethus_scan
glinton Oct 24, 2018
b1f933c
Update tests
glinton Oct 24, 2018
09bf31a
Address some feedback
glinton Oct 31, 2018
7c666fd
Allow configurable scheme
glinton Nov 1, 2018
1bb20b2
Remove goto
glinton Nov 2, 2018
c4203e2
Improve backoff
glinton Nov 2, 2018
79c60a3
Fix tests
glinton Nov 2, 2018
372e47d
Address feedback
glinton Nov 2, 2018
c5f952f
Pass context down
glinton Nov 2, 2018
f6d05ed
Move error logging up
glinton Nov 5, 2018
cdd47df
Merge branch 'master' into prometheus_scan
glinton Nov 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update tests
  • Loading branch information
@glinton
glinton committed Oct 24, 2018
commit b1f933c332e4f21c21cbb0e206f46564a409041f
2 changes: 1 addition & 1 deletion plugins/inputs/prometheus/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func registerPod(pod *corev1.Pod, p *Prometheus) {
}
URL, err := url.Parse(*targetURL)
if err != nil {
log.Printf("E! [inputs.prometheus] could not parse URL %q: %v", targetURL, err)
log.Printf("E! [inputs.prometheus] could not parse URL %q: %v", *targetURL, err)
return
}
podURL := p.AddressToURL(URL, URL.Hostname())
Expand Down
12 changes: 6 additions & 6 deletions plugins/inputs/prometheus/kubernetes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,39 +13,39 @@ import (
func TestScrapeURLNoAnnotations(t *testing.T) {
p := &v1.Pod{Metadata: &metav1.ObjectMeta{}}
p.GetMetadata().Annotations = map[string]string{}
url := scrapeURL(p)
url := getScrapeURL(p)
assert.Nil(t, url)
}
func TestScrapeURLAnnotationsNoScrape(t *testing.T) {
p := &v1.Pod{Metadata: &metav1.ObjectMeta{}}
p.Metadata.Name = str("myPod")
p.Metadata.Annotations = map[string]string{"prometheus.io/scrape": "false"}
url := scrapeURL(p)
url := getScrapeURL(p)
assert.Nil(t, url)
}
func TestScrapeURLAnnotations(t *testing.T) {
p := pod()
p.Metadata.Annotations = map[string]string{"prometheus.io/scrape": "true"}
url := scrapeURL(p)
url := getScrapeURL(p)
assert.Equal(t, "http://127.0.0.1:9102/metrics", *url)
}
func TestScrapeURLAnnotationsCustomPort(t *testing.T) {
p := pod()
p.Metadata.Annotations = map[string]string{"prometheus.io/scrape": "true", "prometheus.io/port": "9000"}
url := scrapeURL(p)
url := getScrapeURL(p)
assert.Equal(t, "http://127.0.0.1:9000/metrics", *url)
}
func TestScrapeURLAnnotationsCustomPath(t *testing.T) {
p := pod()
p.Metadata.Annotations = map[string]string{"prometheus.io/scrape": "true", "prometheus.io/path": "mymetrics"}
url := scrapeURL(p)
url := getScrapeURL(p)
assert.Equal(t, "http://127.0.0.1:9102/mymetrics", *url)
}

func TestScrapeURLAnnotationsCustomPathWithSep(t *testing.T) {
p := pod()
p.Metadata.Annotations = map[string]string{"prometheus.io/scrape": "true", "prometheus.io/path": "/mymetrics"}
url := scrapeURL(p)
url := getScrapeURL(p)
assert.Equal(t, "http://127.0.0.1:9102/mymetrics", *url)
}

Expand Down