fix: make Jaeger work again

This commit is contained in:
Stefan Reimer 2024-04-15 13:25:01 +00:00
parent 8ee77752a3
commit 8a7863cc16
10 changed files with 94 additions and 7 deletions

View File

@ -6,7 +6,7 @@ cgroupDriver: cgroupfs
logging:
format: json
hairpinMode: hairpin-veth
ContainerRuntimeEndpoint: "unix:///var/run/crio/crio.sock"
containerRuntimeEndpoint: "unix:///var/run/crio/crio.sock"
{{- if .Values.systemd }}
resolvConf: /run/systemd/resolve/resolv.conf
{{- end }}

View File

@ -24,7 +24,7 @@ spec:
volumeMounts:
- name: host
mountPath: /host
readOnly: true
#readOnly: true
- name: workdir
mountPath: /tmp
env:

View File

@ -0,0 +1,61 @@
# kubezero-telemetry
![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
KubeZero Umbrella Chart for OpenTelemetry, Jaeger etc.
**Homepage:** <https://kubezero.com>
## Maintainers
| Name | Email | Url |
| ---- | ------ | --- |
| Stefan Reimer | <stefan@zero-downtime.net> | |
## Requirements
Kubernetes: `>= 1.26.0`
| Repository | Name | Version |
|------------|------|---------|
| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
| https://jaegertracing.github.io/helm-charts | jaeger | 2.1.0 |
| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.87.0 |
## Values
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| jaeger.agent.enabled | bool | `false` | |
| jaeger.collector.service.otlp.grpc.name | string | `"otlp-grpc"` | |
| jaeger.collector.service.otlp.grpc.port | int | `4317` | |
| jaeger.collector.service.otlp.http.name | string | `"otlp-http"` | |
| jaeger.collector.service.otlp.http.port | int | `4318` | |
| jaeger.collector.serviceMonitor.enabled | bool | `false` | |
| jaeger.enabled | bool | `false` | |
| jaeger.istio.enabled | bool | `false` | |
| jaeger.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | |
| jaeger.istio.url | string | `"jaeger.example.com"` | |
| jaeger.provisionDataStore.cassandra | bool | `false` | |
| jaeger.provisionDataStore.elasticsearch | bool | `false` | |
| jaeger.query.agentSidecar.enabled | bool | `false` | |
| jaeger.query.serviceMonitor.enabled | bool | `false` | |
| jaeger.storage.elasticsearch.cmdlineParams."es.tls.enabled" | string | `""` | |
| jaeger.storage.elasticsearch.cmdlineParams."es.tls.skip-host-verify" | string | `""` | |
| jaeger.storage.elasticsearch.host | string | `"telemetry"` | |
| jaeger.storage.elasticsearch.password | string | `"admin"` | |
| jaeger.storage.elasticsearch.scheme | string | `"https"` | |
| jaeger.storage.elasticsearch.user | string | `"admin"` | |
| jaeger.storage.type | string | `"elasticsearch"` | |
| opensearch.dashboard.enabled | bool | `false` | |
| opensearch.dashboard.istio.enabled | bool | `false` | |
| opensearch.dashboard.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | |
| opensearch.dashboard.istio.url | string | `"telemetry-dashboard.example.com"` | |
| opensearch.nodeSets | list | `[]` | |
| opensearch.prometheus | bool | `false` | |
| opensearch.version | string | `"2.13.0"` | |
| opentelemetry-collector.enabled | bool | `false` | |
| opentelemetry-collector.mode | string | `"deployment"` | |
----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

View File

@ -17,6 +17,14 @@ spec:
enable: {{ .Values.opensearch.prometheus }}
tlsConfig:
insecureSkipVerify: true
podSecurityContext:
runAsUser: 1000
runAsGroup: 1000
runAsNonRoot: true
fsGroup: 1000
securityContext:
allowPrivilegeEscalation: false
privileged: false
{{- if .Values.opensearch.dashboard.enabled }}
# https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/config/opensearch_dashboards.yml
dashboards:
@ -56,15 +64,18 @@ spec:
opster.io/opensearch-cluster: {{ template "kubezero-lib.fullname" $ }}
additionalConfig:
index.codec: zstd_no_dict
indices.time_series_index.default_index_merge_policy: log_byte_size
indices.time_series_index.default_index_merge_policy: log_byte_size
{{- with .zone }}
cluster.routing.allocation.awareness.attributes: k8s_node_name,zone
node.attr.zone: {{ . }}
{{- end }}
{{- with $.Values.opensearch.settings }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
security:
config:
adminSecret:
adminSecret:
name: {{ template "kubezero-lib.fullname" . }}-admin-tls
tls:
transport:

View File

@ -7,3 +7,5 @@ set -ex
#login_ecr_public
update_helm
update_docs

View File

@ -52,6 +52,10 @@ opensearch:
version: 2.11.1
prometheus: false
# custom cluster settings
#settings:
# index.number_of_shards: 1
nodeSets:
- name: default
replicas: 2

View File

@ -49,9 +49,13 @@ jaeger:
url: jaeger.example.com
opensearch:
version: 2.12.0
version: 2.13.0
prometheus: false
# custom cluster settings
#settings:
# index.number_of_shards: 1
nodeSets: []
#- name: default-nodes
# replicas: 2

View File

@ -30,6 +30,11 @@ opensearch:
{{- end }}
{{- end }}
{{- with .Values.telemetry.opensearch.settings }}
settings:
{{- toYaml . | nindent 4 }}
{{- end }}
prometheus: {{ .Values.metrics.enabled }}
{{- end }}

View File

@ -85,7 +85,7 @@ falco:
telemetry:
enabled: false
namespace: telemetry
targetRevision: 0.2.1
targetRevision: 0.2.2
operators:
enabled: false

View File

@ -4,7 +4,7 @@
- all KubeZero and support AMIs based on Alpine 3.19.1
- further reduced boot time, eg. less than 30s for a bastion on EC2
- sub-second timestamps for all system logs
- enabled TransparentHugePages incl. save settings for Golang
- enabled TransparentHugePages on host kernel
## Version upgrades
- cilium 1.15.3