Revert "Small fixes for local monitoring setup,"

This reverts commit 80995d3.

Author: MSpryszynski

handler.js

@@ -19,7 +19,7 @@ const {
     cpuMetric,
     memoryMetric,
     cTimeMetric,
-} = process.env.HF_VAR_ENABLE_OTEL === "1" ? require('./metrics-definition') : {};
+} = require('./metrics-definition');
 
 const {
     procfs,

metrics-definition.js

@@ -1,4 +1,4 @@
-const meter = process.env.HF_VAR_ENABLE_OTEL === "1" ? require("./metrics.js")("hyperflow-job-executor"): undefined;
+const meter = process.env.HF_VAR_ENABLE_TRACING === "1" ? require("./metrics.js")("hyperflow-job-executor"): undefined;
 
 
 const cpuMetric = meter.createObservableGauge('cpu-usage', {

monitoring-local-setup/docker-compose.yml

@@ -20,13 +20,12 @@ services:
     container_name: opensearch
     environment:
       - cluster.name=opensearch-cluster
-      - node.name=opensearch
+      - node.name=opensearc
       - discovery.seed_hosts=opensearch
       - cluster.initial_cluster_manager_nodes=opensearch
       - bootstrap.memory_lock=true
       - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
       - OPENSEARCH_INITIAL_ADMIN_PASSWORD=Hyperflow1!
-      - plugins.security.disabled=true
     ulimits:
       memlock:
         soft: -1
@@ -49,8 +48,7 @@ services:
     expose:
       - "5601"
     environment:
-      OPENSEARCH_HOSTS: '["http://opensearch:9200"]'
-      DISABLE_SECURITY_DASHBOARDS_PLUGIN: "true"
+      OPENSEARCH_HOSTS: '["https://opensearch:9200"]'
     networks:
       - backend
   data-prepper:

monitoring-local-setup/otel-collector-config.yaml

@@ -25,6 +25,10 @@ exporters:
       insecure: true
       insecure_skip_verify: true
 
+  logging:
+    verbosity: detailed
+
+
 service:
   pipelines:
     traces:
@@ -37,5 +41,5 @@ service:
       exporters: [otlp/metrics]
     logs:
       receivers: [otlp]
-      exporters: [otlp/logs]
+      exporters: [logging, otlp/logs]
 

monitoring-local-setup/pipelines.yaml

@@ -16,13 +16,12 @@ raw-pipeline:
     - otel_trace_raw:
   sink:
     - opensearch:
-        hosts: ["http://opensearch:9200"]
+        hosts: ["https://opensearch:9200"]
         insecure: true
         username: admin
         password: "Hyperflow1!"
         index_type: custom
         index: hyperflow_traces
-        ssl: false
 service-map-pipeline:
   delay: "100"
   source:
@@ -32,12 +31,11 @@ service-map-pipeline:
     - service_map_stateful:
   sink:
     - opensearch:
-        hosts: ["http://opensearch:9200"]
+        hosts: ["https://opensearch:9200"]
         insecure: true
         username: admin
         password: "Hyperflow1!"
         index_type: trace-analytics-service-map
-        ssl: false
 
 
 metrics-pipeline:
@@ -46,24 +44,22 @@ metrics-pipeline:
       ssl: false
   sink:
     - opensearch:
-        hosts: ["http://opensearch:9200"]
+        hosts: ["https://opensearch:9200"]
         insecure: true
         username: admin
         password: "Hyperflow1!"
         index_type: custom
         index: hyperflow_metrics
-        ssl: false
 
 logs-pipeline:
   source:
     otel_logs_source:
       ssl: false
   sink:
     - opensearch:
-        hosts: ["http://opensearch:9200"]
+        hosts: ["https://opensearch:9200"]
         insecure: true
         username: admin
         password: "Hyperflow1!"
         index: hyperflow_logs
-        ssl: false
 

package.json

@@ -15,11 +15,7 @@
     "connector.js",
     "handler.js",
     "jobexec.js",
-    "hflow-job-listener.js",
-    "logs.js",
-    "metrics.js",
-    "metrics-definition.js",
-    "tracing.js"
+    "hflow-job-listener.js"
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",