Merge branch 'influx' of https://github.com/arstercz/telegraf into in…

…flux
arstercz · Dec 25, 2023 · 01d8036 · 01d8036
2 parents c43e58c + 465763e
commit 01d8036
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/plugins/inputs/docker/README.md b/plugins/inputs/docker/README.md
@@ -307,7 +307,7 @@ status if configured.
     - container_version
   - fields:
     - container_status (integer,  1 = created, 2 = running, 3 = paused, 4 = restarting, 5 = removing, 6 = exited, 7 = dead)
-    - health_status (integer,  0 = Unhealthy, 1 = Healthy, 2 = Starting)
+    - health_status (integer,  0 = Unhealthy, 1 = Healthy, 2 = Starting, 4 = NoHealthcheck)
   	- failing_streak (integer)
 
 - docker_container_status

diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
@@ -643,12 +643,16 @@ func (d *Docker) gatherContainerInspect(
 			}
 			healthStatusVal := -1
 			switch info.State.Health.Status {
-			case "Starting":
+			case types.NoHealthcheck:
+				healthStatusVal = 3
+			case types.Starting:
 				healthStatusVal = 2
-			case "Healthy":
+			case types.Healthy:
 				healthStatusVal = 1
-			case "Unhealthy":
+			case types.Unhealthy:
 				healthStatusVal = 0
+			default:
+				d.Log.Warn("docker: unknown health status [%s]", info.State.Health.Status)
 			}
 			healthfields["health_status"] = healthStatusVal
 			acc.AddFields("docker_container_health", healthfields, tags, now())