Skip to content

Commit

Permalink
Change response tag 'server' to 'source' in traefik input plugin (inf…
Browse files Browse the repository at this point in the history
  • Loading branch information
mkboudreau committed Oct 3, 2018
1 parent 5647b12 commit 0615ea8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions plugins/inputs/traefik/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Configuration with additional measurements for each status code encountered:
### Tags:

- All measurements have the following tags:
- **server**
- **source**

- `traefik_status_codes` measurement have the following additional tags:
- **status_code**
Expand All @@ -80,8 +80,8 @@ SELECT difference(last("count")) FROM "traefik_status_codes" WHERE time > now()
./telegraf -config telegraf.conf -input-filter traefik -test
> traefik,server=http://localhost:8080,instance=prod,host=My-MacBook-Pro.local status_code_302=27117i,status_code_307=4i,status_code_400=1011i,status_code_404=812i,status_code_401=1i,total_response_time_sec=83381.956659941,total_count=1222527i,uptime_sec=1387245.424820805,unixtime=1518039391i,status_code_500=34i,status_code_504=1206i,status_code_503=1i,status_code_301=3i,average_response_time_sec=0.068204593,status_code_502=715i,status_code_304=559007i,status_code_200=632616i,health_response_time_sec=0.061906656 1518039391000000000
> traefik,source=http://localhost:8080,instance=prod,host=My-MacBook-Pro.local status_code_302=27117i,status_code_307=4i,status_code_400=1011i,status_code_404=812i,status_code_401=1i,total_response_time_sec=83381.956659941,total_count=1222527i,uptime_sec=1387245.424820805,unixtime=1518039391i,status_code_500=34i,status_code_504=1206i,status_code_503=1i,status_code_301=3i,average_response_time_sec=0.068204593,status_code_502=715i,status_code_304=559007i,status_code_200=632616i,health_response_time_sec=0.061906656 1518039391000000000
> traefik_status_codes,server=http://localhost:8080,status_code=304,instance=prod total_count=1588167i,uptime_sec=1629993.771782303,unixtime=1518624416i,count=752109i,health_response_time_sec=1.0587943 1518624424000000000
> traefik_status_codes,source=http://localhost:8080,status_code=304,instance=prod total_count=1588167i,uptime_sec=1629993.771782303,unixtime=1518624416i,count=752109i,health_response_time_sec=1.0587943 1518624424000000000
```
2 changes: 1 addition & 1 deletion plugins/inputs/traefik/traefik.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func (t *Traefik) Gather(acc telegraf.Accumulator) error {
json.NewDecoder(resp.Body).Decode(&healthData)
t.lastRequestTiming = time.Since(start).Seconds()

tags := map[string]string{"server": t.Address}
tags := map[string]string{"source": t.Address}
fields := map[string]interface{}{"health_response_time_sec": t.lastRequestTiming}

t.submitPrimaryMeasurement(acc, healthData, tags, fields)
Expand Down
8 changes: 4 additions & 4 deletions plugins/inputs/traefik/traefik_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func TestGatherPrimaryHealthCheck(t *testing.T) {
defer server.Close()

traefik := &Traefik{
Address: server.URL,
Address: server.URL,
IncludeStatusCodeMeasurement: false,
}
var acc testutil.Accumulator
Expand All @@ -50,7 +50,7 @@ func TestGatherStatusCodes(t *testing.T) {
defer server.Close()

traefik := &Traefik{
Address: server.URL,
Address: server.URL,
IncludeStatusCodeMeasurement: true,
}
var acc testutil.Accumulator
Expand All @@ -68,10 +68,10 @@ func TestGatherStatusCodes(t *testing.T) {
assert.False(t, acc.HasField("traefik_status_codes", "status_code_400"), "should not have status_code_* fields")
acc.AssertContainsTaggedFields(t, "traefik_status_codes",
expected200Fields,
map[string]string{"status_code": "200", "server": server.URL})
map[string]string{"status_code": "200", "source": server.URL})
acc.AssertContainsTaggedFields(t, "traefik_status_codes",
expected404Fields,
map[string]string{"status_code": "404", "server": server.URL})
map[string]string{"status_code": "404", "source": server.URL})
}

func TestHTTPSGatherHealthCheckIntegration(t *testing.T) {
Expand Down

0 comments on commit 0615ea8

Please sign in to comment.