diff --git a/charts/coroot/Chart.yaml b/charts/coroot/Chart.yaml
index ee6c14d..e00045d 100644
--- a/charts/coroot/Chart.yaml
+++ b/charts/coroot/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
name: coroot
description: A monitoring and troubleshooting tool for microservice architectures.
type: application
-version: 0.9.1
-appVersion: "1.0.0-rc1"
+version: 0.10.0
+appVersion: "1.0.0-rc2"
dependencies:
- name: prometheus
repository: https://prometheus-community.github.io/helm-charts
@@ -17,7 +17,3 @@ dependencies:
version: 3.1.*
repository: https://charts.bitnami.com/bitnami
condition: clickhouse.enabled
- - name: opentelemetry-collector
- version: 0.52.*
- repository: https://open-telemetry.github.io/opentelemetry-helm-charts
- condition: opentelemetry-collector.enabled
diff --git a/charts/coroot/templates/deployment.yaml b/charts/coroot/templates/deployment.yaml
index dc58690..67f4fd2 100644
--- a/charts/coroot/templates/deployment.yaml
+++ b/charts/coroot/templates/deployment.yaml
@@ -54,17 +54,9 @@ spec:
name: {{ include "coroot.clickhouse.fullname" . }}
key: "admin-password"
- name: BOOTSTRAP_CLICKHOUSE_USER
- value: {{ index .Values "opentelemetry-collector" "config" "exporters" "clickhouse" "username" }}
+ value: {{ .Values.corootCE.bootstrap.clickhouse.username }}
- name: BOOTSTRAP_CLICKHOUSE_DATABASE
- value: {{ index .Values "opentelemetry-collector" "config" "exporters" "clickhouse" "database" }}
- {{- end }}
- {{- if and .Values.corootCE.bootstrap.otel.traces.enabled }}
- - name: BOOTSTRAP_CLICKHOUSE_TRACES_TABLE
- value: {{ index .Values "opentelemetry-collector" "config" "exporters" "clickhouse" "traces_table_name" }}
- {{- end }}
- {{- if and .Values.corootCE.bootstrap.otel.logs.enabled }}
- - name: BOOTSTRAP_CLICKHOUSE_LOGS_TABLE
- value: {{ index .Values "opentelemetry-collector" "config" "exporters" "clickhouse" "logs_table_name" }}
+ value: {{ .Values.corootCE.bootstrap.clickhouse.database }}
{{- end }}
{{- with .Values.corootCE.env }}
{{- . | toYaml | nindent 12 }}
diff --git a/charts/coroot/templates/service.yaml b/charts/coroot/templates/service.yaml
index 0ef9eb2..4bb7204 100644
--- a/charts/coroot/templates/service.yaml
+++ b/charts/coroot/templates/service.yaml
@@ -21,4 +21,26 @@ spec:
name: http
selector:
{{- include "coroot.selectorLabels" . | nindent 4 }}
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: coroot-opentelemetry-collector
+ {{- with .Values.corootCE.service.annotations }}
+ annotations:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
+ labels:
+ {{- include "coroot.labels" . | nindent 4 }}
+spec:
+ type: {{ .Values.corootCE.service.type }}
+ ports:
+ - port: 4318
+ targetPort: http
+ protocol: TCP
+ name: otel-http
+ selector:
+ {{- include "coroot.selectorLabels" . | nindent 4 }}
{{- end -}}
diff --git a/charts/coroot/values.yaml b/charts/coroot/values.yaml
index cf931af..61e85ea 100644
--- a/charts/coroot/values.yaml
+++ b/charts/coroot/values.yaml
@@ -2,11 +2,9 @@ corootCE:
enabled: true
bootstrap:
refreshInterval: 15s
- otel:
- traces:
- enabled: true
- logs:
- enabled: true
+ clickhouse:
+ database: default
+ username: default
replicas: 1
strategy:
type: Recreate
@@ -103,20 +101,14 @@ corootClusterAgent:
fullnameOverride: ""
config:
listen: :8080
- clickhouse:
- address: coroot-clickhouse:9000
- database: default
- auth:
- user: default
- password: ${CLICKHOUSE_PASSWORD}
+ coroot_url: http://coroot:8080
profiles:
- ttl_days: 7
scrape:
interval: 1m
image:
repository: ghcr.io/coroot/coroot-cluster-agent
pullPolicy: IfNotPresent
- tag: "0.1.0"
+ tag: "0.2.0"
imagePullSecrets: []
podAnnotations: {}
podSecurityContext: {}
@@ -130,7 +122,6 @@ corootClusterAgent:
affinity: {}
env: []
-
prometheus:
enabled: true
alertmanager:
@@ -396,7 +387,6 @@ prometheus:
target_label: __metrics_path__
replacement: /api/v1/nodes/$1/proxy/metrics/cadvisor
-
existingPrometheus:
enabled: false
service:
@@ -405,12 +395,12 @@ existingPrometheus:
serviceNamespace: default
node-agent-podmonitor:
enabled: true
-
+
node-agent:
enabled: true
- tracesEndpoint: "http://coroot-opentelemetry-collector:4318/v1/traces"
- logsEndpoint: "http://coroot-opentelemetry-collector:4318/v1/logs"
- profilesEndpoint: "http://coroot-cluster-agent:8080/profiles"
+ tracesEndpoint: "http://coroot:8080/v1/traces"
+ logsEndpoint: "http://coroot:8080/v1/logs"
+ profilesEndpoint: "http://coroot:8080/v1/profiles"
clickhouse:
enabled: true
@@ -432,54 +422,3 @@ clickhouse:
-
-opentelemetry-collector:
- enabled: true
- mode: deployment
- extraEnvs:
- - name: CLICKHOUSE_PASSWORD
- valueFrom:
- secretKeyRef:
- name: coroot-clickhouse
- key: admin-password
- ports:
- jaeger-compact:
- enabled: false
- jaeger-thrift:
- enabled: false
- jaeger-grpc:
- enabled: false
- zipkin:
- enabled: false
-
- config:
- processors:
- batch:
- timeout: 5s
- send_batch_size: 100000
- exporters:
- clickhouse:
- endpoint: tcp://coroot-clickhouse:9000?dial_timeout=10s&compress=lz4
- database: default
- ttl_days: 7
- username: default
- password: ${env:CLICKHOUSE_PASSWORD}
- logs_table_name: otel_logs
- traces_table_name: otel_traces
- metrics_table_name: otel_metrics
- timeout: 5s
- retry_on_failure:
- enabled: true
- initial_interval: 5s
- max_interval: 30s
- max_elapsed_time: 300s
- service:
- pipelines:
- traces:
- processors: [batch]
- exporters: [clickhouse]
- receivers: [otlp]
- logs:
- processors: [batch]
- exporters: [clickhouse]
- receivers: [otlp]