chore: test otelcol configs from example directory (#1173)

* chore: test otelcol configs from example directory * fixes after review
SumoLogic · Jun 26, 2023 · a353505 · a353505
1 parent e517a9f
commit a353505
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 7 deletions.
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -503,7 +503,7 @@ Span ID:
 Flags: 0
 ```
 
-Example configuration with example log can be found in [/examples/logs_json/](/examples/logs_json/) directory.
+Example configuration with example log can be found in [/examples/otelcolconfigs/logs_json/](/examples/otelcolconfigs/logs_json/) directory.
 
 [json_parser]: https://github.com/open-telemetry/opentelemetry-log-collection/blob/main/docs/operators/json_parser.md
 [filelogreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.80.0/receiver/filelogreceiver

diff --git a/examples/README.md b/examples/README.md
@@ -1,12 +1,13 @@
 # Examples
 
 - [ansible](ansible) - example Ansible playbook to install Sumo Logic Distribution for OpenTelemetry Collector
-- [config_cpu_load_metrics.yaml](config_cpu_load_metrics.yaml) - example configuration to collect CPU load metrics using [Host Metrics Receiver][hostmetricsreceiver]
 - [puppet](puppet) - example manifest and module to install Sumo Logic Distribution for OpenTelemetry Collector with Puppet
 - [chef](chef) - example cookbook to install Sumo Logic Distribution for OpenTelemetry Collector with Chef
-- [config_logging.yaml](config_logging.yaml) - example configuration to collect CPU load metrics using
+- [otelcolconfigs](otelcolconfigs) - a directory that contains sample opentelemetry collector configurations, such as:
+  - [config_cpu_load_metrics.yaml](otelcolconfigs/config_cpu_load_metrics.yaml) - example configuration to collect CPU load metrics using [Host Metrics Receiver][hostmetricsreceiver]
+  - [config_logging.yaml](otelcolconfigs/config_logging.yaml) - example configuration to collect CPU load metrics using
   [Host Metrics Receiver][hostmetricsreceiver] without sending them to Sumo Logic.
-- [logs_json](logs_json) - example configuration to parse logs using [json_parser][json_parser] with example log
+  - [logs_json](otelcolconfigs/logs_json) - example configuration to parse logs using [json_parser][json_parser] with example log
 
 [hostmetricsreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.52.0/receiver/hostmetricsreceiver
 [json_parser]: https://github.com/open-telemetry/opentelemetry-log-collection/blob/main/docs/operators/json_parser.md
diff --git a/examples/logs_json/example.log b/examples/logs_json/example.log
diff --git a/examples/otelcolconfigs/README.md b/examples/otelcolconfigs/README.md
@@ -0,0 +1,9 @@
+# Examples
+
+- [config_cpu_load_metrics.yaml](config_cpu_load_metrics.yaml) - example configuration to collect CPU load metrics using [Host Metrics Receiver][hostmetricsreceiver]
+- [config_logging.yaml](config_logging.yaml) - example configuration to collect CPU load metrics using
+  [Host Metrics Receiver][hostmetricsreceiver] without sending them to Sumo Logic.
+- [logs_json](logs_json) - example configuration to parse logs using [json_parser][json_parser] with example log
+
+[hostmetricsreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.52.0/receiver/hostmetricsreceiver
+[json_parser]: https://github.com/open-telemetry/opentelemetry-log-collection/blob/main/docs/operators/json_parser.md
diff --git a/examples/config_cpu_load_metrics.yaml → ...elcolconfigs/config_cpu_load_metrics.yaml b/examples/config_cpu_load_metrics.yaml → ...elcolconfigs/config_cpu_load_metrics.yaml
diff --git a/examples/config_logging.yaml → examples/otelcolconfigs/config_logging.yaml b/examples/config_logging.yaml → examples/otelcolconfigs/config_logging.yaml
diff --git a/examples/logs_json/config.yaml → ...ples/otelcolconfigs/logs_json/config.yaml b/examples/logs_json/config.yaml → ...ples/otelcolconfigs/logs_json/config.yaml
@@ -6,12 +6,12 @@ exporters:
 receivers:
   filelog:
     include:
-    - /sumologic/examples/logs_json/example.log
+    - examples/otelcolconfigs/logs_json/example.log
     start_at: beginning
     operators:
       - type: json_parser
       - type: json_parser
-        parse_from: message
+        parse_from: body.message
 service:
   pipelines:
     logs:

diff --git a/examples/verify_installation.yaml → ...s/otelcolconfigs/verify_installation.yaml b/examples/verify_installation.yaml → ...s/otelcolconfigs/verify_installation.yaml
diff --git a/otelcolbuilder/cmd/collector_config_test.go b/otelcolbuilder/cmd/collector_config_test.go
@@ -82,6 +82,14 @@ func TestBuiltCollectorWithConfigurationFiles(t *testing.T) {
 			name:       "multiple config files can be handled by the glob config provider",
 			configFile: "glob:testdata/multiple/*.yaml",
 		},
+		{
+			name:       "collect CPU load metrics using Host Metrics Receiver",
+			configFile: "../../examples/otelcolconfigs/config_logging.yaml",
+		},
+		{
+			name:       "config to parse logs using json_parser",
+			configFile: "../../examples/otelcolconfigs/logs_json/config.yaml",
+		},
 	}
 
 	for _, tc := range testcases {