Skip to content

Commit

Permalink
Remove the telemetry service (#757)
Browse files Browse the repository at this point in the history
* Remove the telemetry service

The telemetry service is no longer needed, now that prometheus scrapes
metrics directly from proxies, and the public-api talks directly to
prometheus. In this branch I'm removing the service itself as well as
all of the telemetry protobuf, and updating the conduit install command
to no longer install the service. I'm also removing the old version of
the stat command, which required the telemetry service, and renaming the
statsummary command to stat.

* Fix time window tests

* Remove deprecated controller scrape config

Signed-off-by: Kevin Lingerfelt <kl@buoyant.io>
  • Loading branch information
klingerf authored Apr 13, 2018
1 parent efdfc93 commit fb15fe7
Show file tree
Hide file tree
Showing 38 changed files with 183 additions and 4,168 deletions.
1 change: 0 additions & 1 deletion .prometheus.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ scrape_configs:
- 'proxy-api:9996'
- 'public-api:9995'
- 'tap:9998'
- 'telemetry:9997'
- 'web:9994'
relabel_configs:
- action: labelmap
Expand Down
8 changes: 0 additions & 8 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ written in Go. The dashboard UI is a React application.
clients such as `cli` and `web`, provides access to and control of the
conduit service mesh.
- [`tap`](controller/tap): Provides a live pipeline of requests.
- [`telemetry`](controller/telemetry): Collects and aggregates
metrics from `proxy` componenets.
- [`proxy-init`](proxy-init): Adds a Kubernetes pod to join the Conduit
Service Mesh.
- [`web`](web): Provides a UI dashboard to view and drive the control plane.
Expand Down Expand Up @@ -70,7 +68,6 @@ conduit_components
"proxy-api" [color=lightblue];
"public-api" [color=lightblue];
"tap" [color=lightblue];
"telemetry" [color=lightblue];
"web" [color=lightblue];

"proxy" [color=orange];
Expand All @@ -83,16 +80,11 @@ conduit_components
"proxy" -> "proxy-api";

"proxy-api" -> "destination";
"proxy-api" -> "telemetry";

"public-api" -> "tap";
"public-api" -> "telemetry";

"tap" -> "kubernetes";
"tap" -> "proxy";

"telemetry" -> "kubernetes";
"telemetry" -> "prometheus";
}
conduit_components
</details>
Expand Down
3 changes: 0 additions & 3 deletions bin/protoc-go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ mkdir controller/gen
bin/protoc -I proto --go_out=plugins=grpc:controller/gen proto/public/api.proto
bin/protoc -I proto --go_out=plugins=grpc:controller/gen proto/common/common.proto
bin/protoc -I proto --go_out=plugins=grpc:controller/gen proto/common/healthcheck/healthcheck.proto
bin/protoc -I proto --go_out=plugins=grpc:controller/gen proto/proxy/telemetry/telemetry.proto
bin/protoc -I proto --go_out=plugins=grpc:controller/gen proto/proxy/destination/destination.proto
bin/protoc -I proto --go_out=plugins=grpc:controller/gen proto/proxy/tap/tap.proto
bin/protoc -I proto --go_out=plugins=grpc:controller/gen proto/controller/telemetry/telemetry.proto
bin/protoc -I proto --go_out=plugins=grpc:controller/gen proto/controller/tap/tap.proto

# Manually fix imports
Expand All @@ -22,4 +20,3 @@ find controller/gen -type f -exec sed -i.bak 's:"proxy/tap":"github.com\/runcond
find controller/gen -type f -exec sed -i.bak 's:"controller/tap":"github.com\/runconduit\/conduit\/controller\/gen\/controller\/tap":g' {} +
find controller/gen -type f -exec sed -i.bak 's:"public":"github.com\/runconduit\/conduit\/controller\/gen\/public":g' {} +
find controller/gen -name '*.bak' -delete

214 changes: 0 additions & 214 deletions cli/cmd/stat.go

This file was deleted.

Loading

0 comments on commit fb15fe7

Please sign in to comment.