Adding environment field for AROClusterLogs

Author: mhsreddy

pkg/deploy/assets/gateway-production.json

@@ -92,13 +92,13 @@ main() {
 [FILTER]
 	Name modify
 	Match journald
-	Remove_wildcard _
-	Remove TIMESTAMP
+	Add ENVIRONMENT \${ENVIRONMENT}
 
 [FILTER]
 	Name modify
 	Match journald
-	Add ENVIRONMENT \${ENVIRONMENT}
+	Remove_wildcard _
+	Remove TIMESTAMP
 
 [OUTPUT]
 	Name forward

pkg/deploy/assets/rp-production.json

@@ -109,13 +109,13 @@ main() {
 [FILTER]
 	Name modify
 	Match journald
-	Remove_wildcard _
-	Remove TIMESTAMP
+	Add ENVIRONMENT \${ENVIRONMENT}
 
 [FILTER]
 	Name modify
 	Match journald
-	Add ENVIRONMENT \${ENVIRONMENT}
+	Remove_wildcard _
+	Remove TIMESTAMP
 
 [FILTER]
 	Name rewrite_tag

pkg/deploy/generator/scripts/gatewayVMSS.sh

@@ -232,6 +232,10 @@ func (r *Reconciler) daemonset(cluster *arov1alpha1.Cluster) (*appsv1.DaemonSet,
 									Name:  "MONITORING_USE_GENEVA_CONFIG_SERVICE",
 									Value: "true",
 								},
+								{
+									Name:  "MONITORING_ENVIRONMENT",
+									Value: cluster.Spec.OperatorFlags.GetWithDefault("aro.environment", ""),
+								},
 								{
 									Name:  "MONITORING_TENANT",
 									Value: cluster.Spec.Location,

pkg/deploy/generator/scripts/rpVMSS.sh

@@ -366,6 +366,14 @@ func (o *operator) clusterObject() (*arov1alpha1.Cluster, error) {
 		},
 	}
 
+	// Set aro.environment operator flag for MONITORING_ENVIRONMENT in cluster logs
+	if cluster.Spec.OperatorFlags == nil {
+		cluster.Spec.OperatorFlags = arov1alpha1.OperatorFlags{}
+	}
+	if _, exists := cluster.Spec.OperatorFlags["aro.environment"]; !exists {
+		cluster.Spec.OperatorFlags["aro.environment"] = o.env.EnvironmentType()
+	}
+
 	if o.oc.Properties.FeatureProfile.GatewayEnabled && o.oc.Properties.NetworkProfile.GatewayPrivateEndpointIP != "" {
 		cluster.Spec.GatewayDomains = append(o.env.GatewayDomains(), o.oc.Properties.ImageRegistryStorageAccountName+".blob."+o.env.Environment().StorageEndpointSuffix)
 	} else {