diff --git a/collector/lib/CollectorConfigInspector.cpp b/collector/lib/CollectorRuntimeConfigInspector.cpp similarity index 96% rename from collector/lib/CollectorConfigInspector.cpp rename to collector/lib/CollectorRuntimeConfigInspector.cpp index dfaa04b0d0..95e1b1faac 100644 --- a/collector/lib/CollectorConfigInspector.cpp +++ b/collector/lib/CollectorRuntimeConfigInspector.cpp @@ -1,4 +1,4 @@ -#include "CollectorConfigInspector.h" +#include "CollectorRuntimeConfigInspector.h" #include #include @@ -7,7 +7,7 @@ namespace collector { -const std::string CollectorConfigInspector::kBaseRoute = "/state/config"; +const std::string CollectorConfigInspector::kBaseRoute = "/state/runtime-config"; CollectorConfigInspector::CollectorConfigInspector(const CollectorConfig& config) : config_(config) { } diff --git a/collector/lib/CollectorConfigInspector.h b/collector/lib/CollectorRuntimeConfigInspector.h similarity index 85% rename from collector/lib/CollectorConfigInspector.h rename to collector/lib/CollectorRuntimeConfigInspector.h index 7e90933635..bc46d311a3 100644 --- a/collector/lib/CollectorConfigInspector.h +++ b/collector/lib/CollectorRuntimeConfigInspector.h @@ -1,5 +1,5 @@ -#ifndef COLLECTOR_CONFIG_INSPECTOR_H -#define COLLECTOR_CONFIG_INSPECTOR_H +#ifndef COLLECTOR_RUNTIME_CONFIG_INSPECTOR_H +#define COLLECTOR_RUNTIME_CONFIG_INSPECTOR_H #include diff --git a/collector/lib/CollectorService.cpp b/collector/lib/CollectorService.cpp index 7b09a5480e..78f66b9a1e 100644 --- a/collector/lib/CollectorService.cpp +++ b/collector/lib/CollectorService.cpp @@ -11,7 +11,7 @@ extern "C" { #include #include "CivetServer.h" -#include "CollectorConfigInspector.h" +#include "CollectorRuntimeConfigInspector.h" #include "CollectorStatsExporter.h" #include "ConnTracker.h" #include "Containers.h" diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 23a4e6dff9..c56d0a3ab0 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -603,7 +603,7 @@ $ curl "http://:8080/state/network/connection?container=c6f030bc4b42& } ``` -### Config endpoint +### Runtime config endpoint The runtime configuration can be obtained using -$ curl "http://:8080/state/config" +$ curl "http://:8080/state/runtime-config" diff --git a/integration-tests/pkg/assert/assert.go b/integration-tests/pkg/assert/assert.go index c39fba1813..5f14fc0827 100644 --- a/integration-tests/pkg/assert/assert.go +++ b/integration-tests/pkg/assert/assert.go @@ -23,7 +23,7 @@ func AssertExternalIps(t *testing.T, enabled bool, collectorIP string) { tickTime := 1 * time.Second timeout := 3 * time.Minute AssertRepeated(t, tickTime, timeout, runtimeConfigErrorMsg, func() bool { - body, err := collector.IntrospectionQuery(collectorIP, "/state/config") + body, err := collector.IntrospectionQuery(collectorIP, "/state/runtime-config") assert.NoError(t, err) var response types.RuntimeConfig err = json.Unmarshal(body, &response) @@ -37,7 +37,7 @@ func AssertNoRuntimeConfig(t *testing.T, collectorIP string) { tickTime := 1 * time.Second timeout := 3 * time.Minute AssertRepeated(t, tickTime, timeout, runtimeConfigErrorMsg, func() bool { - body, err := collector.IntrospectionQuery(collectorIP, "/state/config") + body, err := collector.IntrospectionQuery(collectorIP, "/state/runtime-config") assert.NoError(t, err) return strings.TrimSpace(string(body)) == "{}" })