Merge pull request #31 from SumoLogic/repo-sync/apps/default

🔄 synced file(s) with Sanyaku/apps

assets/conf.d/darwin.yaml

@@ -30,6 +30,9 @@ receivers:
       - type: move
         from: attributes["log.file.path"]
         to: resource["log.file.path"]
+      - type: copy
+        from: resource["log.file.path"]
+        to: resource["_sourceName"]
     include:
       - /var/log/system.log
       - /var/log/install.log
@@ -40,9 +43,25 @@ processors:
       - key: sumo.datasource
         value: mac
         action: insert
+      - key: _contentType
+        value: OpenTelemetry
+        action: insert
       - key: _sourceCategory
         value: otel/mac
         action: insert
+  resource/mac_resource_attributes/metrics/localhost:
+    attributes:
+      - key: _source
+        value: mac/hostmetrics
+        action: insert
+      - key: _sourceName
+        value: mac
+        action: insert
+  resource/mac_resource_attributes/logs/localhost:
+    attributes:
+      - key: _source
+        value: mac/filelog
+        action: insert
 service:
   pipelines:
     metrics/mac/localhost:
@@ -52,6 +71,7 @@ service:
         - memory_limiter
         - resource/mac_resource_attributes/localhost
         - resourcedetection/system
+        - resource/mac_resource_attributes/metrics/localhost
         - batch
       exporters:
         - sumologic
@@ -62,6 +82,7 @@ service:
         - memory_limiter
         - resource/mac_resource_attributes/localhost
         - resourcedetection/system
+        - resource/mac_resource_attributes/logs/localhost
         - batch
       exporters:
         - sumologic

assets/conf.d/examples/activedirectory.yaml.example

@@ -1,16 +1,39 @@
 receivers:
   windowseventlog/activedirectory/application/localhost:
     channel: Application
+    operators:
+      - type: add
+        field: resource["_sourceName"]
+        value: Application
   windowseventlog/activedirectory/security/localhost:
     channel: Security
+    operators:
+      - type: add
+        field: resource["_sourceName"]
+        value: Security
   windowseventlog/activedirectory/system/localhost:
     channel: System
+    operators:
+      - type: add
+        field: resource["_sourceName"]
+        value: System
 processors:
   resource/activedirectory_resource_attributes/localhost:
     attributes:
       - key: sumo.datasource
         value: activeDirectory
         action: insert
+      - key: _contentType
+        value: OpenTelemetry
+        action: insert
+      - key: _sourceCategory
+        value: otel/activeDirectory
+        action: insert
+  resource/activedirectory_resource_attributes/logs/localhost:
+    attributes:
+      - key: _source
+        value: activeDirectory/windowseventlog
+        action: insert
 service:
   pipelines:
     logs/activedirectory/localhost:
@@ -21,6 +44,7 @@ service:
       processors:
         - memory_limiter
         - resourcedetection/system
+        - resource/activedirectory_resource_attributes/logs/localhost
         - resource/activedirectory_resource_attributes/localhost
         - batch
       exporters:

assets/conf.d/examples/activemq.yaml.example

@@ -34,6 +34,9 @@ receivers:
       - type: move
         from: attributes["log.file.path"]
         to: resource["log.file.path"]
+      - type: copy
+        from: resource["log.file.path"]
+        to: resource["_sourceName"]
     include:
       - /opt/bitnami/activemq/data/activemq.log
   filelog/activemqauditLogs/localhost:
@@ -45,6 +48,9 @@ receivers:
       - type: move
         from: attributes["log.file.path"]
         to: resource["log.file.path"]
+      - type: copy
+        from: resource["log.file.path"]
+        to: resource["_sourceName"]
     include:
       - /opt/bitnami/activemq/data/audit.log
 processors:
@@ -56,6 +62,9 @@ processors:
       - key: sumo.datasource
         value: activemq
         action: insert
+      - key: _contentType
+        value: OpenTelemetry
+        action: insert
       - key: messaging.node.name
         action: insert
         from_attribute: host.name
@@ -65,6 +74,19 @@ processors:
       - key: _sourceCategory
         value: otel/activemq
         action: insert
+  resource/activemq_resource_attributes/metrics/localhost:
+    attributes:
+      - key: _source
+        value: activemq/jmx
+        action: insert
+      - key: _sourceName
+        value: activemq
+        action: insert
+  resource/activemq_resource_attributes/logs/localhost:
+    attributes:
+      - key: _source
+        value: activemq/filelog
+        action: insert
 service:
   pipelines:
     metrics/activemqmetrics/localhost:
@@ -74,6 +96,7 @@ service:
       processors:
         - memory_limiter
         - resourcedetection/system
+        - resource/activemq_resource_attributes/metrics/localhost
         - resource/activemq_resource_attributes/localhost
         - batch
       exporters:
@@ -85,6 +108,7 @@ service:
       processors:
         - memory_limiter
         - resourcedetection/system
+        - resource/activemq_resource_attributes/logs/localhost
         - resource/activemq_resource_attributes/localhost
         - batch
       exporters:

assets/conf.d/examples/apache.yaml.example

@@ -8,6 +8,9 @@ receivers:
       - type: move
         from: attributes["log.file.path"]
         to: resource["log.file.path"]
+      - type: copy
+        from: resource["log.file.path"]
+        to: resource["_sourceName"]
     include:
       - /var/log/apache2/access.log
   filelog/apache/errorLogs/localhost:
@@ -19,6 +22,9 @@ receivers:
       - type: move
         from: attributes["log.file.path"]
         to: resource["log.file.path"]
+      - type: copy
+        from: resource["log.file.path"]
+        to: resource["_sourceName"]
     include:
       - /var/log/apache2/error.log
 processors:
@@ -30,12 +36,28 @@ processors:
       - key: sumo.datasource
         value: apache
         action: insert
+      - key: _contentType
+        value: OpenTelemetry
+        action: insert
       - key: webengine.node.name
         action: insert
         from_attribute: host.name
       - key: webengine.cluster.name
         value: apache_cluster
         action: insert
+  resource/apache_resource_attributes/metrics/localhost:
+    attributes:
+      - key: _source
+        value: apache/apache
+        action: insert
+      - key: _sourceName
+        value: apache
+        action: insert
+  resource/apache_resource_attributes/logs/localhost:
+    attributes:
+      - key: _source
+        value: apache/filelog
+        action: insert
 service:
   pipelines:
     metrics/apache/localhost:
@@ -44,6 +66,7 @@ service:
       processors:
         - memory_limiter
         - resourcedetection/system
+        - resource/apache_resource_attributes/metrics/localhost
         - resource/apache_resource_attributes/localhost
         - batch
       exporters:
@@ -55,6 +78,7 @@ service:
       processors:
         - memory_limiter
         - resourcedetection/system
+        - resource/apache_resource_attributes/logs/localhost
         - resource/apache_resource_attributes/localhost
         - batch
       exporters:

assets/conf.d/examples/artifactory7.yaml.example

@@ -6,6 +6,9 @@ receivers:
       - type: move
         from: attributes["log.file.path"]
         to: resource["log.file.path"]
+      - type: copy
+        from: resource["log.file.path"]
+        to: resource["_sourceName"]
     include:
       - /var/opt/jfrog/artifactory/logs/artifactory.log
   filelog/artifactory/accesslogs/localhost:
@@ -15,6 +18,9 @@ receivers:
       - type: move
         from: attributes["log.file.path"]
         to: resource["log.file.path"]
+      - type: copy
+        from: resource["log.file.path"]
+        to: resource["_sourceName"]
     include:
       - /var/opt/jfrog/artifactory/logs/access.log
   filelog/artifactory/requestlogs/localhost:
@@ -24,6 +30,9 @@ receivers:
       - type: move
         from: attributes["log.file.path"]
         to: resource["log.file.path"]
+      - type: copy
+        from: resource["log.file.path"]
+        to: resource["_sourceName"]
     include:
       - /var/opt/jfrog/artifactory/logs/request.log
   filelog/artifactory/trafficlogs/localhost:
@@ -33,6 +42,9 @@ receivers:
       - type: move
         from: attributes["log.file.path"]
         to: resource["log.file.path"]
+      - type: copy
+        from: resource["log.file.path"]
+        to: resource["_sourceName"]
     include:
       - /var/opt/jfrog/artifactory/logs/traffic.*.log
 processors:
@@ -41,6 +53,17 @@ processors:
       - key: sumo.datasource
         value: artifactory
         action: insert
+      - key: _contentType
+        value: OpenTelemetry
+        action: insert
+      - key: _sourceCategory
+        value: otel/artifactory
+        action: insert
+  resource/artifactory_resource_attributes/logs/localhost:
+    attributes:
+      - key: _source
+        value: artifactory/filelog
+        action: insert
 service:
   pipelines:
     logs/artifactory/localhost:
@@ -54,5 +77,6 @@ service:
         - resource/artifactory_resource_attributes/localhost
         - batch
         - resourcedetection/system
+        - resource/artifactory_resource_attributes/logs/localhost
       exporters:
         - sumologic

assets/conf.d/examples/cassandra.yaml.example

@@ -6,6 +6,9 @@ receivers:
       - type: move
         from: attributes["log.file.path"]
         to: resource["log.file.path"]
+      - type: copy
+        from: resource["log.file.path"]
+        to: resource["_sourceName"]
     include:
       - /var/log/cassandra/system.log
 processors:
@@ -17,9 +20,17 @@ processors:
       - key: sumo.datasource
         value: cassandra
         action: insert
+      - key: _contentType
+        value: OpenTelemetry
+        action: insert
       - key: db.cluster.name
         value: test
         action: insert
+  resource/cassandra_resource_attributes/logs/localhost:
+    attributes:
+      - key: _source
+        value: cassandra/filelog
+        action: insert
 service:
   pipelines:
     logs/cassandra/localhost:
@@ -30,5 +41,6 @@ service:
         - resource/cassandra_resource_attributes/localhost
         - batch
         - resourcedetection/system
+        - resource/cassandra_resource_attributes/logs/localhost
       exporters:
         - sumologic

assets/conf.d/examples/couchbase.yaml.example

@@ -6,6 +6,9 @@ receivers:
       - type: move
         from: attributes["log.file.path"]
         to: resource["log.file.path"]
+      - type: copy
+        from: resource["log.file.path"]
+        to: resource["_sourceName"]
     include:
       - /opt/couchbase/var/lib/couchbase/logs/audit.log
   filelog/couchbase/error/localhost:
@@ -15,6 +18,9 @@ receivers:
       - type: move
         from: attributes["log.file.path"]
         to: resource["log.file.path"]
+      - type: copy
+        from: resource["log.file.path"]
+        to: resource["_sourceName"]
     include:
       - /opt/couchbase/var/lib/couchbase/logs/error.log
   filelog/couchbase/access/localhost:
@@ -24,6 +30,9 @@ receivers:
       - type: move
         from: attributes["log.file.path"]
         to: resource["log.file.path"]
+      - type: copy
+        from: resource["log.file.path"]
+        to: resource["_sourceName"]
     include:
       - /opt/couchbase/var/lib/couchbase/logs/http_access.log
   filelog/couchbase/query/localhost:
@@ -33,6 +42,9 @@ receivers:
       - type: move
         from: attributes["log.file.path"]
         to: resource["log.file.path"]
+      - type: copy
+        from: resource["log.file.path"]
+        to: resource["_sourceName"]
     include:
       - /opt/couchbase/var/lib/couchbase/logs/query.log
 processors:
@@ -44,9 +56,17 @@ processors:
       - key: sumo.datasource
         value: couchbase
         action: insert
+      - key: _contentType
+        value: OpenTelemetry
+        action: insert
       - key: db.cluster.name
         value: couchbaseOtelCluster
         action: insert
+  resource/couchbase_resource_attributes/logs/localhost:
+    attributes:
+      - key: _source
+        value: couchbase/filelog
+        action: insert
 service:
   pipelines:
     logs/couchbase/localhost:
@@ -58,6 +78,7 @@ service:
       processors:
         - memory_limiter
         - resourcedetection/system
+        - resource/couchbase_resource_attributes/logs/localhost
         - resource/couchbase_resource_attributes/localhost
         - batch
       exporters: