Skip to content

Add otel and Jaeger as component #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 16, 2023
Merged

Add otel and Jaeger as component #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e4fce3
Add otel as component
abeatrix Feb 15, 2023
00aeb54
update template
abeatrix Feb 15, 2023
1690639
remove automerge
abeatrix Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions .github/workflows/automerge.yml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions components/clusters/old-base/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
components:
- ../../monitoring
- ../../monitoring/otel
- ../../monitoring/cadvisor
- ../../monitoring/rbacs
- ../../enable/service-discovery
Expand Down
4 changes: 4 additions & 0 deletions components/monitoring/otel/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
resources:
- ../../../base/monitoring/otel-collector
2 changes: 2 additions & 0 deletions instances/template/kustomization.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ components:
#---------------------------------------------------------------------------------------
- ../../components/monitoring # -- Add default resources for Sourcegraph monitoring services
# - ../../components/monitoring/cadvisor # -- Add resources for cAdvisor (requires privileges)
# - ../../components/monitoring/otel # -- Add resources for otel
# - ../../components/monitoring/tracing # -- Add resources for otel with Jaeger as tracing backend
# - ../../components/monitoring/privileged # -- Run monitoring stack with privileged and root access
# - ../../components/remove/daemonset # -- Remove all services with daemonsets: node-exporter & otel
# - ../../components/remove/otel-collector # -- Remove otel-collector and otel-agent
Expand Down