Skip to content

Commit 80995d3

Browse files
committed
Small fixes for local monitoring setup,
Fix job-executor with disabled otel-monitoring
1 parent d48cecc commit 80995d3

File tree

6 files changed

+20
-14
lines changed

6 files changed

+20
-14
lines changed

handler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const {
1919
cpuMetric,
2020
memoryMetric,
2121
cTimeMetric,
22-
} = require('./metrics-definition');
22+
} = process.env.HF_VAR_ENABLE_OTEL === "1" ? require('./metrics-definition') : {};
2323

2424
const {
2525
procfs,

metrics-definition.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const meter = process.env.HF_VAR_ENABLE_TRACING === "1" ? require("./metrics.js")("hyperflow-job-executor"): undefined;
1+
const meter = process.env.HF_VAR_ENABLE_OTEL === "1" ? require("./metrics.js")("hyperflow-job-executor"): undefined;
22

33

44
const cpuMetric = meter.createObservableGauge('cpu-usage', {

monitoring-local-setup/docker-compose.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ services:
2020
container_name: opensearch
2121
environment:
2222
- cluster.name=opensearch-cluster
23-
- node.name=opensearc
23+
- node.name=opensearch
2424
- discovery.seed_hosts=opensearch
2525
- cluster.initial_cluster_manager_nodes=opensearch
2626
- bootstrap.memory_lock=true
2727
- "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
2828
- OPENSEARCH_INITIAL_ADMIN_PASSWORD=Hyperflow1!
29+
- plugins.security.disabled=true
2930
ulimits:
3031
memlock:
3132
soft: -1
@@ -48,7 +49,8 @@ services:
4849
expose:
4950
- "5601"
5051
environment:
51-
OPENSEARCH_HOSTS: '["https://opensearch:9200"]'
52+
OPENSEARCH_HOSTS: '["http://opensearch:9200"]'
53+
DISABLE_SECURITY_DASHBOARDS_PLUGIN: "true"
5254
networks:
5355
- backend
5456
data-prepper:

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ exporters:
2525
insecure: true
2626
insecure_skip_verify: true
2727

28-
logging:
29-
verbosity: detailed
30-
31-
3228
service:
3329
pipelines:
3430
traces:
@@ -41,5 +37,5 @@ service:
4137
exporters: [otlp/metrics]
4238
logs:
4339
receivers: [otlp]
44-
exporters: [logging, otlp/logs]
40+
exporters: [otlp/logs]
4541

monitoring-local-setup/pipelines.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ raw-pipeline:
1616
- otel_trace_raw:
1717
sink:
1818
- opensearch:
19-
hosts: ["https://opensearch:9200"]
19+
hosts: ["http://opensearch:9200"]
2020
insecure: true
2121
username: admin
2222
password: "Hyperflow1!"
2323
index_type: custom
2424
index: hyperflow_traces
25+
ssl: false
2526
service-map-pipeline:
2627
delay: "100"
2728
source:
@@ -31,11 +32,12 @@ service-map-pipeline:
3132
- service_map_stateful:
3233
sink:
3334
- opensearch:
34-
hosts: ["https://opensearch:9200"]
35+
hosts: ["http://opensearch:9200"]
3536
insecure: true
3637
username: admin
3738
password: "Hyperflow1!"
3839
index_type: trace-analytics-service-map
40+
ssl: false
3941

4042

4143
metrics-pipeline:
@@ -44,22 +46,24 @@ metrics-pipeline:
4446
ssl: false
4547
sink:
4648
- opensearch:
47-
hosts: ["https://opensearch:9200"]
49+
hosts: ["http://opensearch:9200"]
4850
insecure: true
4951
username: admin
5052
password: "Hyperflow1!"
5153
index_type: custom
5254
index: hyperflow_metrics
55+
ssl: false
5356

5457
logs-pipeline:
5558
source:
5659
otel_logs_source:
5760
ssl: false
5861
sink:
5962
- opensearch:
60-
hosts: ["https://opensearch:9200"]
63+
hosts: ["http://opensearch:9200"]
6164
insecure: true
6265
username: admin
6366
password: "Hyperflow1!"
6467
index: hyperflow_logs
68+
ssl: false
6569

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
"connector.js",
1616
"handler.js",
1717
"jobexec.js",
18-
"hflow-job-listener.js"
18+
"hflow-job-listener.js",
19+
"logs.js",
20+
"metrics.js",
21+
"metrics-definition.js",
22+
"tracing.js"
1923
],
2024
"dependencies": {
2125
"@opentelemetry/api": "^1.9.0",

0 commit comments

Comments
 (0)