feat: promote OTel apachereceiver definition to prod with k8s support

entity-types/infra-apacheserver/definition.yml

@@ -1,28 +1,10 @@
 domain: INFRA
 type: APACHESERVER
-goldenTags:
-- apache.hostname
-- apache.port
-- apache.version
-# Open Telemetry
-- apache.server.name
-- apache.server.port
-
-configuration:
-  entityExpirationTime: DAILY
-  alertable: true
-
-dashboardTemplates:
-  # This should match the entity created from the ohi in the infra pipeline
-  newRelic:
-    template: newrelic_dashboard.json
-  opentelemetry:
-    template: opentelemetry_dashboard.json
 
 synthesis:
   rules:
-  # Legacy short-form library name
-  - ruleName: infra_apacheserver_composite
+  # OpenTelemetry synthesis rule - new collector format
+  - ruleName: infra_apacheserver_otel_new
     compositeIdentifier:
       separator: ":"
       attributes:
@@ -37,24 +19,35 @@ synthesis:
         prefix: apache.
       - attribute: instrumentation.provider
         value: opentelemetry
-      # This filters only metrics coming from apache receiver, given that metrics
-      # could deffer between different runtime receivers. 
+      # New collector format
       - attribute: otel.library.name
-        value: otelcol/apachereceiver
+        value: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver"
     tags:
+      # Required resource attributes
+      apache.server.name:
+      apache.server.port:
+      host.name:
+        ttl: P1D
+      host.id:
+        ttl: P1D
       # Environment resource attributes
       host.type:
       cloud.provider:
       cloud.account.id:
       cloud.region:
+      # Kubernetes attributes (optional)
+      k8s.cluster.name:
+        ttl: P1D
+      k8s.namespace.name:
+        ttl: P1D
+      k8s.pod.name:
+        ttl: P1D
       # OTel attributes
       otel.library.name:
         entityTagName: instrumentation.name
-      apache.server.name:
-      apache.server.port:
 
-  # Modern full GitHub-URL library name
-  - ruleName: infra_apacheserver_otel_contrib
+  # OpenTelemetry synthesis rule - old collector format
+  - ruleName: infra_apacheserver_otel_old
     compositeIdentifier:
       separator: ":"
       attributes:
@@ -69,26 +62,60 @@ synthesis:
         prefix: apache.
       - attribute: instrumentation.provider
         value: opentelemetry
-      # This filters only metrics coming from apache receiver, given that metrics
-      # could deffer between different runtime receivers. 
+      # Old collector format
       - attribute: otel.library.name
-        value: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver"
+        value: "otelcol/apachereceiver"
     tags:
+      # Required resource attributes
+      apache.server.name:
+      apache.server.port:
+      host.name:
+        ttl: P1D
+      host.id:
+        ttl: P1D
       # Environment resource attributes
       host.type:
       cloud.provider:
       cloud.account.id:
       cloud.region:
+      # Kubernetes attributes (optional)
+      k8s.cluster.name:
+        ttl: P1D
+      k8s.namespace.name:
+        ttl: P1D
+      k8s.pod.name:
+        ttl: P1D
       # OTel attributes
       otel.library.name:
         entityTagName: instrumentation.name
-      apache.server.name:
-      apache.server.port:
+
   tags:
     # For OpenTelemetry
     telemetry.sdk.name:
       entityTagName: instrumentation.provider
 
+goldenTags:
+- apache.server.name
+- apache.server.port
+- apache.version
+- host.name
+- host.id
+# Kubernetes attributes
+- k8s.cluster.name
+- k8s.namespace.name
+- k8s.pod.name
+
+configuration:
+  entityExpirationTime: DAILY
+  alertable: true
+
+dashboardTemplates:
+  # This should match the entity created from the ohi in the infra pipeline
+  newRelic:
+    template: newrelic_dashboard.json
+  opentelemetry:
+    template: opentelemetry_dashboard.json
+
 ownership:
   primaryOwner:
     teamName: "OnHost Agent and Integrations"