diff --git a/pkg/resource/logging-config/alloy-logging-config.go b/pkg/resource/logging-config/alloy-logging-config.go index 91007588..ba466988 100644 --- a/pkg/resource/logging-config/alloy-logging-config.go +++ b/pkg/resource/logging-config/alloy-logging-config.go @@ -92,7 +92,7 @@ func generateAlloyConfig(lc loggedcluster.Interface, observabilityBundleVersion SecretName: common.AlloyLogAgentAppName, LoggingURLKey: common.LoggingURL, LoggingTenantIDKey: common.LoggingTenantID, - LoggingUsernameKey: clusterName, + LoggingUsernameKey: common.LoggingUsername, LoggingPasswordKey: common.LoggingPassword, } diff --git a/pkg/resource/logging-config/alloy/test/logging-config.alloy.162_MC.yaml b/pkg/resource/logging-config/alloy/test/logging-config.alloy.162_MC.yaml index 6e94b891..2974d347 100644 --- a/pkg/resource/logging-config/alloy/test/logging-config.alloy.162_MC.yaml +++ b/pkg/resource/logging-config/alloy/test/logging-config.alloy.162_MC.yaml @@ -290,7 +290,7 @@ alloy: tenant_id = nonsensitive(remote.kubernetes.secret.credentials.data["logging-tenant-id"]) basic_auth { - username = nonsensitive(remote.kubernetes.secret.credentials.data["test-installation"]) + username = nonsensitive(remote.kubernetes.secret.credentials.data["logging-username"]) password = remote.kubernetes.secret.credentials.data["logging-password"] } diff --git a/pkg/resource/logging-config/alloy/test/logging-config.alloy.162_WC.yaml b/pkg/resource/logging-config/alloy/test/logging-config.alloy.162_WC.yaml index 352e7c41..90ac4c0b 100644 --- a/pkg/resource/logging-config/alloy/test/logging-config.alloy.162_WC.yaml +++ b/pkg/resource/logging-config/alloy/test/logging-config.alloy.162_WC.yaml @@ -295,7 +295,7 @@ alloy: tenant_id = nonsensitive(remote.kubernetes.secret.credentials.data["logging-tenant-id"]) basic_auth { - username = nonsensitive(remote.kubernetes.secret.credentials.data["test-cluster"]) + username = nonsensitive(remote.kubernetes.secret.credentials.data["logging-username"]) password = remote.kubernetes.secret.credentials.data["logging-password"] } diff --git a/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_MC.yaml b/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_MC.yaml index 4a069a55..b4930eed 100644 --- a/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_MC.yaml +++ b/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_MC.yaml @@ -270,7 +270,7 @@ alloy: tenant_id = nonsensitive(remote.kubernetes.secret.credentials.data["logging-tenant-id"]) basic_auth { - username = nonsensitive(remote.kubernetes.secret.credentials.data["test-installation"]) + username = nonsensitive(remote.kubernetes.secret.credentials.data["logging-username"]) password = remote.kubernetes.secret.credentials.data["logging-password"] } diff --git a/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_WC.yaml b/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_WC.yaml index 3c50852d..89f928d9 100644 --- a/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_WC.yaml +++ b/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_WC.yaml @@ -270,7 +270,7 @@ alloy: tenant_id = nonsensitive(remote.kubernetes.secret.credentials.data["logging-tenant-id"]) basic_auth { - username = nonsensitive(remote.kubernetes.secret.credentials.data["test-cluster"]) + username = nonsensitive(remote.kubernetes.secret.credentials.data["logging-username"]) password = remote.kubernetes.secret.credentials.data["logging-password"] } diff --git a/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_WC_default_namespaces_empty.yaml b/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_WC_default_namespaces_empty.yaml index 73706e6c..69493491 100644 --- a/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_WC_default_namespaces_empty.yaml +++ b/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_WC_default_namespaces_empty.yaml @@ -270,7 +270,7 @@ alloy: tenant_id = nonsensitive(remote.kubernetes.secret.credentials.data["logging-tenant-id"]) basic_auth { - username = nonsensitive(remote.kubernetes.secret.credentials.data["test-cluster"]) + username = nonsensitive(remote.kubernetes.secret.credentials.data["logging-username"]) password = remote.kubernetes.secret.credentials.data["logging-password"] } diff --git a/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_WC_default_namespaces_nil.yaml b/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_WC_default_namespaces_nil.yaml index 73706e6c..69493491 100644 --- a/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_WC_default_namespaces_nil.yaml +++ b/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_WC_default_namespaces_nil.yaml @@ -270,7 +270,7 @@ alloy: tenant_id = nonsensitive(remote.kubernetes.secret.credentials.data["logging-tenant-id"]) basic_auth { - username = nonsensitive(remote.kubernetes.secret.credentials.data["test-cluster"]) + username = nonsensitive(remote.kubernetes.secret.credentials.data["logging-username"]) password = remote.kubernetes.secret.credentials.data["logging-password"] }