Skip to content

Commit ecb0f2c

Browse files
MikeShi42MikeShi42
authored
feat: Add JSON support to all in one build (#972)
1 parent 808145b commit ecb0f2c

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

‎docker/hyperdx/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
# - Otel Collector (otelcol)
99

1010
ARG NODE_VERSION=22.16.0
11-
ARG CLICKHOUSE_VERSION=24
12-
ARG OTEL_COLLECTOR_VERSION=0.126.0
13-
ARG OTEL_COLLECTOR_OPAMPSUPERVISOR_VERSION=0.126.0
11+
ARG CLICKHOUSE_VERSION=25.6
12+
ARG OTEL_COLLECTOR_VERSION=0.129.1
13+
ARG OTEL_COLLECTOR_OPAMPSUPERVISOR_VERSION=0.128.0
1414

1515
# base #############################################################################################
1616
# == Otel Collector Image ==

‎docker/hyperdx/clickhouseConfig.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@
2626
<tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
2727
<user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
2828

29-
<users_config>users.xml</users_config>
29+
<user_directories>
30+
<users_xml>
31+
<path>users.xml</path>
32+
</users_xml>
33+
</user_directories>
34+
<!-- <users_config>users.xml</users_config> -->
3035
<default_profile>default</default_profile>
3136
<default_database>default</default_database>
3237
<timezone>UTC</timezone>
@@ -39,7 +44,8 @@
3944
<flush_interval_milliseconds>7500</flush_interval_milliseconds>
4045
</query_log>
4146

42-
<!-- Metric log contains rows with current values of ProfileEvents, CurrentMetrics collected with "collect_interval_milliseconds" interval. -->
47+
<!-- Metric log contains rows with current values of ProfileEvents, CurrentMetrics collected
48+
with "collect_interval_milliseconds" interval. -->
4349
<metric_log>
4450
<database>system</database>
4551
<table>metric_log</table>
@@ -106,7 +112,8 @@
106112
</processors_profile_log>
107113

108114
<!-- Uncomment if use part log.
109-
Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
115+
Part log contains information about all actions with parts in MergeTree tables (creation, deletion,
116+
merges, downloads).-->
110117
<part_log>
111118
<database>system</database>
112119
<table>part_log</table>

‎docker/hyperdx/entry.local.base.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ export NEXT_TELEMETRY_DISABLED="1"
2626
# Set Default Connections and Sources
2727
export DEFAULT_CONNECTIONS='[{"name":"Local ClickHouse","host":"http://localhost:8123","username":"default","password":""}]'
2828
export DEFAULT_SOURCES='[{"from":{"databaseName":"default","tableName":"otel_logs"},"kind":"log","timestampValueExpression":"TimestampTime","name":"Logs","displayedTimestampValueExpression":"Timestamp","implicitColumnExpression":"Body","serviceNameExpression":"ServiceName","bodyExpression":"Body","eventAttributesExpression":"LogAttributes","resourceAttributesExpression":"ResourceAttributes","defaultTableSelectExpression":"Timestamp,ServiceName,SeverityText,Body","severityTextExpression":"SeverityText","traceIdExpression":"TraceId","spanIdExpression":"SpanId","connection":"Local ClickHouse","traceSourceId":"Traces","sessionSourceId":"Sessions","metricSourceId":"Metrics"},{"from":{"databaseName":"default","tableName":"otel_traces"},"kind":"trace","timestampValueExpression":"Timestamp","name":"Traces","displayedTimestampValueExpression":"Timestamp","implicitColumnExpression":"SpanName","serviceNameExpression":"ServiceName","bodyExpression":"SpanName","eventAttributesExpression":"SpanAttributes","resourceAttributesExpression":"ResourceAttributes","defaultTableSelectExpression":"Timestamp,ServiceName,StatusCode,round(Duration/1e6),SpanName","traceIdExpression":"TraceId","spanIdExpression":"SpanId","durationExpression":"Duration","durationPrecision":9,"parentSpanIdExpression":"ParentSpanId","spanNameExpression":"SpanName","spanKindExpression":"SpanKind","statusCodeExpression":"StatusCode","statusMessageExpression":"StatusMessage","connection":"Local ClickHouse","logSourceId":"Logs","sessionSourceId":"Sessions","metricSourceId":"Metrics"},{"from":{"databaseName":"default","tableName":""},"kind":"metric","timestampValueExpression":"TimeUnix","name":"Metrics","resourceAttributesExpression":"ResourceAttributes","metricTables":{"gauge":"otel_metrics_gauge","histogram":"otel_metrics_histogram","sum":"otel_metrics_sum","_id":"682586a8b1f81924e628e808","id":"682586a8b1f81924e628e808"},"connection":"Local ClickHouse","logSourceId":"Logs","traceSourceId":"Traces","sessionSourceId":"Sessions"},{"from":{"databaseName":"default","tableName":"hyperdx_sessions"},"kind":"session","timestampValueExpression":"TimestampTime","name":"Sessions","displayedTimestampValueExpression":"Timestamp","implicitColumnExpression":"Body","serviceNameExpression":"ServiceName","bodyExpression":"Body","eventAttributesExpression":"LogAttributes","resourceAttributesExpression":"ResourceAttributes","defaultTableSelectExpression":"Timestamp,ServiceName,SeverityText,Body","severityTextExpression":"SeverityText","traceIdExpression":"TraceId","spanIdExpression":"SpanId","connection":"Local ClickHouse","logSourceId":"Logs","traceSourceId":"Traces","metricSourceId":"Metrics"}]'
29+
# if BETA_CH_OTEL_JSON_SCHEMA_ENABLED is true then return empty defualt sourcces
30+
if [ "$BETA_CH_OTEL_JSON_SCHEMA_ENABLED" = "true" ]; then
31+
export DEFAULT_SOURCES='[{"from":{"databaseName":"default","tableName":"otel_logs"},"kind":"log","timestampValueExpression":"Timestamp","name":"Logs","displayedTimestampValueExpression":"Timestamp","implicitColumnExpression":"Body","serviceNameExpression":"ServiceName","bodyExpression":"Body","eventAttributesExpression":"LogAttributes","resourceAttributesExpression":"ResourceAttributes","defaultTableSelectExpression":"Timestamp,ServiceName,SeverityText,Body","severityTextExpression":"SeverityText","traceIdExpression":"TraceId","spanIdExpression":"SpanId","connection":"Local ClickHouse","traceSourceId":"Traces","sessionSourceId":"Sessions","metricSourceId":"Metrics"},{"from":{"databaseName":"default","tableName":"otel_traces"},"kind":"trace","timestampValueExpression":"Timestamp","name":"Traces","displayedTimestampValueExpression":"Timestamp","implicitColumnExpression":"SpanName","serviceNameExpression":"ServiceName","bodyExpression":"SpanName","eventAttributesExpression":"SpanAttributes","resourceAttributesExpression":"ResourceAttributes","defaultTableSelectExpression":"Timestamp,ServiceName,StatusCode,round(Duration/1e6),SpanName","traceIdExpression":"TraceId","spanIdExpression":"SpanId","durationExpression":"Duration","durationPrecision":9,"parentSpanIdExpression":"ParentSpanId","spanNameExpression":"SpanName","spanKindExpression":"SpanKind","statusCodeExpression":"StatusCode","statusMessageExpression":"StatusMessage","connection":"Local ClickHouse","logSourceId":"Logs","sessionSourceId":"Sessions","metricSourceId":"Metrics"},{"from":{"databaseName":"default","tableName":""},"kind":"metric","timestampValueExpression":"TimeUnix","name":"Metrics","resourceAttributesExpression":"ResourceAttributes","metricTables":{"gauge":"otel_metrics_gauge","histogram":"otel_metrics_histogram","sum":"otel_metrics_sum","_id":"682586a8b1f81924e628e808","id":"682586a8b1f81924e628e808"},"connection":"Local ClickHouse","logSourceId":"Logs","traceSourceId":"Traces","sessionSourceId":"Sessions"},{"from":{"databaseName":"default","tableName":"hyperdx_sessions"},"kind":"session","timestampValueExpression":"Timestamp","name":"Sessions","displayedTimestampValueExpression":"Timestamp","implicitColumnExpression":"Body","serviceNameExpression":"ServiceName","bodyExpression":"Body","eventAttributesExpression":"LogAttributes","resourceAttributesExpression":"ResourceAttributes","defaultTableSelectExpression":"Timestamp,ServiceName,SeverityText,Body","severityTextExpression":"SeverityText","traceIdExpression":"TraceId","spanIdExpression":"SpanId","connection":"Local ClickHouse","logSourceId":"Logs","traceSourceId":"Traces","metricSourceId":"Metrics"}]'
32+
fi
2933

3034
# Simulate Docker Service DNS
3135
echo "127.0.0.1 ch-server" >> /etc/hosts

0 commit comments

Comments
 (0)