Skip to content

Commit

Permalink
Remove jaeger collector (#616)
Browse files Browse the repository at this point in the history
  • Loading branch information
philipgough authored Oct 4, 2023
1 parent 9d9be6d commit 3ec83ae
Show file tree
Hide file tree
Showing 10 changed files with 3 additions and 775 deletions.
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,11 @@ migrate-vendor:

.PHONY: manifests
manifests: migrate-vendor format $(JSONNET_VENDOR_DIR)
manifests: resources/services/telemeter-template.yaml resources/services/rhelemeter-template.yaml resources/services/jaeger-template.yaml tests/deploy/manifests/minio-template.yaml tests/deploy/manifests/dex-template.yaml
manifests: resources/services/telemeter-template.yaml resources/services/rhelemeter-template.yaml tests/deploy/manifests/minio-template.yaml tests/deploy/manifests/dex-template.yaml
manifests: resources/services/observatorium-template.yaml resources/services/observatorium-metrics-template.yaml resources/services/observatorium-logs-template.yaml resources/services/observatorium-traces-subscriptions-template.yaml resources/services/observatorium-traces-template.yaml resources/crds/observatorium-logs-crds-template.yaml
manifests: resources/services/metric-federation-rule-template.yaml
$(MAKE) clean

resources/services/jaeger-template.yaml: $(wildcard services/jaeger-*) $(JSONNET) $(GOJSONTOYAML) $(JSONNETFMT)
@echo ">>>>> Running jaeger-template"
$(JSONNET) -J "$(JSONNET_VENDOR_DIR)" services/jaeger-template.jsonnet | $(GOJSONTOYAML) > $@

tests/deploy/manifests/minio-template.yaml: $(JSONNET) $(GOJSONTOYAML) $(JSONNETFMT)
@echo ">>>>> Running minio-template"
$(JSONNET) -J "$(JSONNET_VENDOR_DIR)" services/minio-template.jsonnet | $(GOJSONTOYAML) > $@
Expand Down
9 changes: 0 additions & 9 deletions jsonnetfile.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,6 @@
},
"version": "main"
},
{
"source": {
"git": {
"remote": "https://github.com/jaegertracing/jaeger.git",
"subdir": "monitoring/jaeger-mixin"
}
},
"version": "main"
},
{
"source": {
"git": {
Expand Down
14 changes: 2 additions & 12 deletions jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,18 +148,8 @@
"subdir": "operations/mimir-mixin"
}
},
"version": "c1cfa0367dc87440546dabc9081ced3276d3eb77",
"sum": "8bQfVmEekD2KhifhkRrX/UdBIKPotCjXef4umbbEtjM="
},
{
"source": {
"git": {
"remote": "https://github.com/jaegertracing/jaeger.git",
"subdir": "monitoring/jaeger-mixin"
}
},
"version": "3021d314f71b9ce0707e8f5a443dd49b6a73d7da",
"sum": "OQCueps8UH/JhWnoA1dX7P9Q7ct3zk2/d8Y7DHNT2YI="
"version": "0421daaa5ffd91c601a130331e1124a4b615695d",
"sum": "vvTsA5XdK4oBTCcin7hbI1eGpeEn+vSH9KZ0ZsBdHxE="
},
{
"source": {
Expand Down
Loading

0 comments on commit 3ec83ae

Please sign in to comment.