Skip to content
This repository was archived by the owner on Nov 7, 2022. It is now read-only.

Commit ddbbf72

Browse files
authored
Update README and k8s.yaml example (#531)
* Update README and k8s.yaml example * Address #451 * Fix collector CLI documentation * Update k8s example to latest standard
1 parent 2b64001 commit ddbbf72

File tree

2 files changed

+42
-21
lines changed

2 files changed

+42
-21
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,12 @@ zpages:
212212

213213
### <a name="agent-usage"></a>Usage
214214

215+
> It is recommended that you use the latest [release](https://github.com/census-instrumentation/opencensus-service/releases).
216+
215217
The ocagent can be run directly from sources, binary, or a Docker image. If you are planning to run from sources or build
216218
on your machine start by cloning the repo using `go get -d github.com/census-instrumentation/opencensus-service`.
217219

218-
It is recommended that you use the latest [release](https://github.com/census-instrumentation/opencensus-service/releases).
219-
220-
The minimum Go version required for this project is Go 1.11.4.
220+
The minimum Go version required for this project is Go 1.11.4. In addition, you must manually install [Bazaar](https://github.com/census-instrumentation/opencensus-service/blob/master/CONTRIBUTING.md#required-tools)
221221

222222
1. Run from sources:
223223

@@ -366,11 +366,11 @@ Usage:
366366
367367
Flags:
368368
--config string Path to the config file
369-
--debug-processor Flag to add a debug processor (combine with log level DEBUG to log incoming spans)
370369
--health-check-http-port uint Port on which to run the healthcheck http server. (default 13133)
371370
-h, --help help for occollector
372371
--http-pprof-port uint Port to be used by golang net/http/pprof (Performance Profiler), the profiler is disabled if no port or 0 is specified.
373-
--log-level string Output level of logs (TRACE, DEBUG, INFO, WARN, ERROR, FATAL) (default "INFO")
372+
--log-level string Output level of logs (DEBUG, INFO, WARN, ERROR, FATAL) (default "INFO")
373+
--logging-exporter Flag to add a logging exporter (combine with log level DEBUG to log incoming spans)
374374
--metrics-level string Output level of telemetry metrics (NONE, BASIC, NORMAL, DETAILED) (default "BASIC")
375375
--metrics-port uint Port exposing collector telemetry. (default 8888)
376376
--receive-jaeger Flag to run the Jaeger receiver (i.e.: Jaeger Collector), default settings: {ThriftTChannelPort:14267 ThriftHTTPPort:14268}

example/k8s.yaml

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ data:
1414
# zipkin: {}
1515
exporters:
1616
opencensus:
17-
endpoint: "oc-collector.default.svc.cluster.local:55678" # TODO: Update me
17+
endpoint: "oc-collector.default:55678" # TODO: Update me
1818
---
1919
apiVersion: extensions/v1beta1
2020
kind: DaemonSet
@@ -31,15 +31,18 @@ spec:
3131
component: oc-agent
3232
spec:
3333
containers:
34-
- image: omnition/opencensus-agent:0.1.0
34+
- command:
35+
- "/ocagent_linux"
36+
- "--config=/conf/oc-agent-config.yaml"
37+
image: omnition/opencensus-agent:0.1.6
3538
name: oc-agent
3639
resources:
3740
limits:
38-
cpu: 0.5
41+
cpu: 500m
3942
memory: 500Mi
40-
command:
41-
- "/ocagent_linux"
42-
- "--config=/conf/oc-agent-config.yaml"
43+
requests:
44+
cpu: 100m
45+
memory: 100Mi
4346
ports:
4447
- containerPort: 55678
4548
- containerPort: 55679
@@ -73,18 +76,24 @@ data:
7376
# Can only use one exporter
7477
# exporters:
7578
# jaeger:
76-
# collector_endpoint: "http://jaeger.default.svc.cluster.local:14268/api/traces"
79+
# collector_endpoint: "http://jaeger.default:14268/api/traces"
7780
# zipkin: {}
7881
queued-exporters:
7982
omnition:
80-
num-workers: 20
83+
batching:
84+
enable: true
85+
timeout: 5s
86+
send-batch-size: 1024
87+
num-workers: 16
8188
queue-size: 10000
8289
retry-on-failure: true
83-
sender-type: jaeger-thrift-http
84-
jaeger-thrift-http:
85-
collector_endpoint: https://ingest.omnition.io/api/traces
90+
opencensus:
91+
compression: "gzip"
92+
endpoint: "ingest.omnition.io:443"
8693
headers: { "x-omnition-api-key":"00000000-0000-0000-0000-000000000001" } # TODO: Update me
87-
timeout: 5s
94+
num-workers: 8
95+
reconnection-delay: 2s
96+
secure: true
8897
---
8998
apiVersion: v1
9099
kind: Service
@@ -130,7 +139,13 @@ spec:
130139
component: oc-collector
131140
spec:
132141
containers:
133-
- image: omnition/opencensus-collector:0.1.0
142+
- command:
143+
- "/occollector_linux"
144+
- "--config=/conf/oc-collector-config.yaml"
145+
env:
146+
- name: GOGC
147+
value: "80"
148+
image: omnition/opencensus-collector:0.1.6
134149
name: oc-collector
135150
resources:
136151
limits:
@@ -139,9 +154,6 @@ spec:
139154
requests:
140155
cpu: 200m
141156
memory: 400Mi
142-
command:
143-
- "/occollector_linux"
144-
- "--config=/conf/oc-collector-config.yaml"
145157
ports:
146158
- containerPort: 55678
147159
# - containerPort: 14267
@@ -150,6 +162,8 @@ spec:
150162
volumeMounts:
151163
- name: oc-collector-config-vol
152164
mountPath: /conf
165+
# - name: oc-collector-secrets
166+
# mountPath: /secrets
153167
livenessProbe:
154168
httpGet:
155169
path: /
@@ -165,3 +179,10 @@ spec:
165179
- key: oc-collector-config
166180
path: oc-collector-config.yaml
167181
name: oc-collector-config-vol
182+
# - secret:
183+
# name: oc-collector-secrets
184+
# items:
185+
# - key: cert.pem
186+
# path: cert.pem
187+
# - key: key.pem
188+
# path: key.pem

0 commit comments

Comments
 (0)