Skip to content

Commit

Permalink
feat: add jaeger-all-in-one for trouble shooting (#209)
Browse files Browse the repository at this point in the history
  • Loading branch information
zyy17 authored Nov 28, 2024
1 parent d74366e commit 9031cac
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
run: |
helm repo add greptime https://greptimeteam.github.io/helm-charts/
helm repo add grafana https://grafana.github.io/helm-charts/
helm repo add jaeger-all-in-one https://raw.githubusercontent.com/hansehe/jaeger-all-in-one/master/helm/charts/
helm search repo greptime
- uses: actions/setup-python@v4
Expand Down
7 changes: 5 additions & 2 deletions charts/greptimedb-cluster/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@ dependencies:
- name: grafana
repository: https://grafana.github.io/helm-charts
version: 8.5.8
digest: sha256:b179fe8efb2cf11a027a8c49ee1cba728dab1be054f625c92fc9fdfffd0f1ab5
generated: "2024-10-26T14:46:51.314884+08:00"
- name: jaeger-all-in-one
repository: https://raw.githubusercontent.com/hansehe/jaeger-all-in-one/master/helm/charts
version: 0.1.12
digest: sha256:e260d018c3781656e59282e609718348d11d82d9d8b3126f57761974b8c9b70f
generated: "2024-11-28T10:39:55.943979+08:00"
9 changes: 8 additions & 1 deletion charts/greptimedb-cluster/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: greptimedb-cluster
description: A Helm chart for deploying GreptimeDB cluster in Kubernetes.
type: application
version: 0.2.36
version: 0.2.37
appVersion: 0.10.2
home: https://github.com/GreptimeTeam/greptimedb
sources:
Expand All @@ -23,3 +23,10 @@ dependencies:
version: "8.5.8"
repository: https://grafana.github.io/helm-charts
condition: grafana.enabled

# TODO(zyy17): Should we use the official Jaeger chart: https://github.com/jaegertracing/helm-charts/tree/main in the future?
# The main function of the current chart is the same as the official one, but more lightweight and easy to use.
- name: jaeger-all-in-one
version: 0.1.12
repository: https://raw.githubusercontent.com/hansehe/jaeger-all-in-one/master/helm/charts
condition: jaeger-all-in-one.enabled
20 changes: 19 additions & 1 deletion charts/greptimedb-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

A Helm chart for deploying GreptimeDB cluster in Kubernetes.

![Version: 0.2.36](https://img.shields.io/badge/Version-0.2.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.10.2](https://img.shields.io/badge/AppVersion-0.10.2-informational?style=flat-square)
![Version: 0.2.37](https://img.shields.io/badge/Version-0.2.37-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.10.2](https://img.shields.io/badge/AppVersion-0.10.2-informational?style=flat-square)

## Source Code

Expand Down Expand Up @@ -74,6 +74,7 @@ helm uninstall mycluster -n default
| Repository | Name | Version |
|------------|------|---------|
| https://grafana.github.io/helm-charts | grafana | 8.5.8 |
| https://raw.githubusercontent.com/hansehe/jaeger-all-in-one/master/helm/charts | jaeger-all-in-one | 0.1.12 |

## Values

Expand Down Expand Up @@ -225,6 +226,23 @@ helm uninstall mycluster -n default
| initializer.registry | string | `"docker.io"` | Initializer image registry |
| initializer.repository | string | `"greptime/greptimedb-initializer"` | Initializer image repository |
| initializer.tag | string | `"v0.1.3"` | Initializer image tag |
| jaeger-all-in-one | object | `{"enableHttpOpenTelemetryCollector":true,"enableHttpZipkinCollector":true,"enabled":false,"image":{"pullPolicy":"IfNotPresent","repository":"jaegertracing/all-in-one","versionOverride":"latest"},"resources":{},"service":{"annotations":{},"port":16686,"type":"ClusterIP"},"volume":{"className":"","enabled":true,"size":"3Gi"}}` | Deploy jaeger-all-in-one for development purpose. |
| jaeger-all-in-one.enableHttpOpenTelemetryCollector | bool | `true` | Enable the opentelemetry collector for jaeger-all-in-one and listen on port 4317. |
| jaeger-all-in-one.enableHttpZipkinCollector | bool | `true` | Enable the zipkin collector for jaeger-all-in-one and listen on port 9411. |
| jaeger-all-in-one.enabled | bool | `false` | Enable jaeger-all-in-one deployment. |
| jaeger-all-in-one.image | object | `{"pullPolicy":"IfNotPresent","repository":"jaegertracing/all-in-one","versionOverride":"latest"}` | The jaeger-all-in-one image configuration. |
| jaeger-all-in-one.image.pullPolicy | string | `"IfNotPresent"` | The jaeger-all-in-one image pull policy. |
| jaeger-all-in-one.image.repository | string | `"jaegertracing/all-in-one"` | The jaeger-all-in-one image repository. |
| jaeger-all-in-one.image.versionOverride | string | `"latest"` | The jaeger-all-in-one image tag. |
| jaeger-all-in-one.resources | object | `{}` | The resources configurations for the jaeger-all-in-one. |
| jaeger-all-in-one.service | object | `{"annotations":{},"port":16686,"type":"ClusterIP"}` | The jaeger-all-in-one service configuration. |
| jaeger-all-in-one.service.annotations | object | `{}` | The annotations for the service. |
| jaeger-all-in-one.service.port | int | `16686` | The service port. |
| jaeger-all-in-one.service.type | string | `"ClusterIP"` | The type of the service. |
| jaeger-all-in-one.volume | object | `{"className":"","enabled":true,"size":"3Gi"}` | The jaeger-all-in-one persistence configuration. |
| jaeger-all-in-one.volume.className | string | `""` | The storageclass for the jaeger-all-in-one. |
| jaeger-all-in-one.volume.enabled | bool | `true` | Whether to enable the persistence for jaeger-all-in-one. |
| jaeger-all-in-one.volume.size | string | `"3Gi"` | The storage size for the jaeger-all-in-one. |
| logging | object | `{"filters":[],"format":"text","level":"info","logsDir":"/data/greptimedb/logs","onlyLogToStdout":false,"persistentWithData":false,"slowQuery":{"enabled":false,"sampleRatio":"1.0","threshold":"10s"}}` | Global logging configuration |
| logging.filters | list | `[]` | The log filters, use the syntax of `target[span\{field=value\}]=level` to filter the logs. |
| logging.format | string | `"text"` | The log format for greptimedb, only support "json" and "text" |
Expand Down
47 changes: 47 additions & 0 deletions charts/greptimedb-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1024,3 +1024,50 @@ grafana:
type: ClusterIP
# -- The annotations for the grafana service.
annotations: {}

# -- Deploy jaeger-all-in-one for development purpose.
jaeger-all-in-one:
# -- Enable jaeger-all-in-one deployment.
enabled: false

# -- The jaeger-all-in-one image configuration.
image:
# -- The jaeger-all-in-one image repository.
repository: jaegertracing/all-in-one
# -- The jaeger-all-in-one image pull policy.
pullPolicy: IfNotPresent
# -- The jaeger-all-in-one image tag.
versionOverride: latest

# -- The jaeger-all-in-one service configuration.
service:
# -- The type of the service.
type: ClusterIP
# -- The service port.
port: 16686
# -- The annotations for the service.
annotations: {}

# -- The jaeger-all-in-one persistence configuration.
volume:
# -- Whether to enable the persistence for jaeger-all-in-one.
enabled: true
# -- The storageclass for the jaeger-all-in-one.
className: ""
# -- The storage size for the jaeger-all-in-one.
size: 3Gi

# -- Enable the zipkin collector for jaeger-all-in-one and listen on port 9411.
enableHttpZipkinCollector: true

# -- Enable the opentelemetry collector for jaeger-all-in-one and listen on port 4317.
enableHttpOpenTelemetryCollector: true

# -- The resources configurations for the jaeger-all-in-one.
resources: {}
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
1 change: 1 addition & 0 deletions scripts/e2e/greptimedb-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ function drop_table() {
function deploy_greptimedb_cluster() {
# Handle greptimedb-cluster dependencies.
helm repo add grafana https://grafana.github.io/helm-charts --force-update
helm repo add jaeger-all-in-one https://raw.githubusercontent.com/hansehe/jaeger-all-in-one/master/helm/charts --force-update
helm dependency build charts/greptimedb-cluster

# Deploy greptimedb cluster.
Expand Down
1 change: 1 addition & 0 deletions scripts/release/release-charts-to-acr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ for dir in "$CHARTS_DIR"/*; do
if [ "$chart_name" == "greptimedb-cluster" ]; then
# Use the OCI registry URL as the repository in the Chart.yaml file.
sed -i 's|https://grafana.github.io/helm-charts|oci://greptime-registry.cn-hangzhou.cr.aliyuncs.com/charts|g' "$dir/Chart.yaml"
sed -i 's|https://raw.githubusercontent.com/hansehe/jaeger-all-in-one/master/helm/charts|oci://greptime-registry.cn-hangzhou.cr.aliyuncs.com/charts|g' "$dir/Chart.yaml"

# Update the dependencies.
helm dependency update "$dir"
Expand Down

0 comments on commit 9031cac

Please sign in to comment.