Skip to content

Commit

Permalink
fix(deps): Update dependencies (#231)
Browse files Browse the repository at this point in the history
Co-authored-by: obs-gh-colinhutchinson <[email protected]>
  • Loading branch information
1 parent a49c6f8 commit 2cb3e13
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 38 deletions.
6 changes: 3 additions & 3 deletions charts/logs/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies:
- name: fluent-bit
repository: https://fluent.github.io/helm-charts
version: 0.47.9
version: 0.47.10
- name: endpoint
repository: file://../endpoint
version: 0.1.12
digest: sha256:13e596eabf15a220e90dd734f7949bd2d7250d2349e934b25db2ac13cb01c40d
generated: "2024-09-08T00:21:25.757158655Z"
digest: sha256:146a13cd3dd76b9e86c8337f50ecfd580c1684e50b4ad01e8b9695086a75c025
generated: "2024-11-03T00:22:45.314579488Z"
4 changes: 2 additions & 2 deletions charts/logs/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apiVersion: v2
name: logs
description: Observe logs collection
type: application
version: 0.1.33
version: 0.1.34
dependencies:
- name: fluent-bit
version: 0.47.9
version: 0.47.10
repository: https://fluent.github.io/helm-charts
- name: endpoint
version: 0.1.12
Expand Down
4 changes: 2 additions & 2 deletions charts/logs/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# logs

![Version: 0.1.33](https://img.shields.io/badge/Version-0.1.33-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
![Version: 0.1.34](https://img.shields.io/badge/Version-0.1.34-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

Observe logs collection

Expand All @@ -15,7 +15,7 @@ Observe logs collection
| Repository | Name | Version |
|------------|------|---------|
| file://../endpoint | endpoint | 0.1.12 |
| https://fluent.github.io/helm-charts | fluent-bit | 0.47.9 |
| https://fluent.github.io/helm-charts | fluent-bit | 0.47.10 |

## Values

Expand Down
8 changes: 4 additions & 4 deletions charts/stack/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies:
- name: logs
repository: file://../logs
version: 0.1.33
version: 0.1.34
- name: metrics
repository: file://../metrics
version: 0.3.25
Expand All @@ -13,6 +13,6 @@ dependencies:
version: 0.1.8
- name: traces
repository: file://../traces
version: 1.0.6
digest: sha256:6df6b041f08a4cbf0c1c4b6100adb097531bcb721f2802b8fa37a2b3ae83f7cf
generated: "2024-10-02T16:27:16.536402-04:00"
version: 1.0.7
digest: sha256:0fe7f81830c329bd2464d1de7ee6042015afbace3df7778d27ebe2431ba33d3b
generated: "2024-11-05T11:08:58.504071-05:00"
6 changes: 3 additions & 3 deletions charts/stack/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apiVersion: v2
name: stack
description: Observe Kubernetes agent stack
type: application
version: 1.1.0
version: 1.1.1
dependencies:
- name: logs
version: 0.1.33
version: 0.1.34
repository: file://../logs
condition: logs.enabled
- name: metrics
Expand All @@ -21,7 +21,7 @@ dependencies:
repository: file://../proxy
condition: proxy.enabled
- name: traces
version: 1.0.6
version: 1.0.7
repository: file://../traces
condition: traces.enabled
maintainers:
Expand Down
6 changes: 3 additions & 3 deletions charts/stack/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# stack

![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

Observe Kubernetes agent stack

Expand All @@ -15,10 +15,10 @@ Observe Kubernetes agent stack
| Repository | Name | Version |
|------------|------|---------|
| file://../events | events | 0.2.0 |
| file://../logs | logs | 0.1.33 |
| file://../logs | logs | 0.1.34 |
| file://../metrics | metrics | 0.3.25 |
| file://../proxy | proxy | 0.1.8 |
| file://../traces | traces | 1.0.6 |
| file://../traces | traces | 1.0.7 |

## Values

Expand Down
6 changes: 3 additions & 3 deletions charts/traces/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies:
- name: opentelemetry-collector
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
version: 0.106.0
version: 0.108.0
- name: endpoint
repository: file://../endpoint
version: 0.1.12
- name: proxy
repository: file://../proxy
version: 0.1.8
digest: sha256:cb9d43a2ef0ca95a8b6ab9a0778318dca899e560c339553f2500fadf87ff9b95
generated: "2024-09-22T00:22:16.315911524Z"
digest: sha256:46bd89b0d988fc06830a9b87545b26a427e7815b5418b163d2abd983fd1bb487
generated: "2024-11-03T00:22:48.362094615Z"
4 changes: 2 additions & 2 deletions charts/traces/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apiVersion: v2
name: traces
description: Observe OpenTelemetry trace collection
type: application
version: 1.0.6
version: 1.0.7
dependencies:
- name: opentelemetry-collector
version: 0.106.0
version: 0.108.0
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
- name: endpoint
version: 0.1.12
Expand Down
12 changes: 6 additions & 6 deletions charts/traces/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# traces

![Version: 1.0.6](https://img.shields.io/badge/Version-1.0.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
![Version: 1.0.7](https://img.shields.io/badge/Version-1.0.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

Observe OpenTelemetry trace collection

Expand All @@ -16,7 +16,7 @@ Observe OpenTelemetry trace collection
|------------|------|---------|
| file://../endpoint | endpoint | 0.1.12 |
| file://../proxy | proxy | 0.1.8 |
| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.106.0 |
| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.108.0 |

## Values

Expand All @@ -38,7 +38,7 @@ Observe OpenTelemetry trace collection
| opentelemetry-collector.clusterRole.rules[0].verbs[1] | string | `"list"` | |
| opentelemetry-collector.clusterRole.rules[0].verbs[2] | string | `"watch"` | |
| opentelemetry-collector.command.extraArgs[0] | string | `"--set=service.telemetry.metrics.address=:58888"` | |
| opentelemetry-collector.config.exporters.logging.loglevel | string | `"info"` | |
| opentelemetry-collector.config.exporters.debug | object | `{}` | |
| opentelemetry-collector.config.exporters.otlphttp.endpoint | string | `"{{ include \"observe.collectionEndpoint\" . }}{{ .Values.global.observe.otelPath }}"` | |
| opentelemetry-collector.config.exporters.otlphttp.headers.authorization | string | `"Bearer ${OBSERVE_TOKEN}"` | |
| opentelemetry-collector.config.exporters.otlphttp.retry_on_failure.enabled | bool | `true` | |
Expand All @@ -64,19 +64,19 @@ Observe OpenTelemetry trace collection
| opentelemetry-collector.config.receivers.otlp.protocols.http | object | `{}` | |
| opentelemetry-collector.config.receivers.zipkin | object | `{}` | |
| opentelemetry-collector.config.service.pipelines.logs.exporters[0] | string | `"otlphttp"` | |
| opentelemetry-collector.config.service.pipelines.logs.exporters[1] | string | `"logging"` | |
| opentelemetry-collector.config.service.pipelines.logs.exporters[1] | string | `"debug"` | |
| opentelemetry-collector.config.service.pipelines.logs.processors[0] | string | `"k8sattributes"` | |
| opentelemetry-collector.config.service.pipelines.logs.processors[1] | string | `"memory_limiter"` | |
| opentelemetry-collector.config.service.pipelines.logs.processors[2] | string | `"batch"` | |
| opentelemetry-collector.config.service.pipelines.logs.receivers[0] | string | `"otlp"` | |
| opentelemetry-collector.config.service.pipelines.metrics.exporters[0] | string | `"otlphttp"` | |
| opentelemetry-collector.config.service.pipelines.metrics.exporters[1] | string | `"logging"` | |
| opentelemetry-collector.config.service.pipelines.metrics.exporters[1] | string | `"debug"` | |
| opentelemetry-collector.config.service.pipelines.metrics.processors[0] | string | `"k8sattributes"` | |
| opentelemetry-collector.config.service.pipelines.metrics.processors[1] | string | `"memory_limiter"` | |
| opentelemetry-collector.config.service.pipelines.metrics.processors[2] | string | `"batch"` | |
| opentelemetry-collector.config.service.pipelines.metrics.receivers[0] | string | `"otlp"` | |
| opentelemetry-collector.config.service.pipelines.traces.exporters[0] | string | `"otlphttp"` | |
| opentelemetry-collector.config.service.pipelines.traces.exporters[1] | string | `"logging"` | |
| opentelemetry-collector.config.service.pipelines.traces.exporters[1] | string | `"debug"` | |
| opentelemetry-collector.config.service.pipelines.traces.processors[0] | string | `"probabilistic_sampler"` | |
| opentelemetry-collector.config.service.pipelines.traces.processors[1] | string | `"k8sattributes"` | |
| opentelemetry-collector.config.service.pipelines.traces.processors[2] | string | `"memory_limiter"` | |
Expand Down
9 changes: 4 additions & 5 deletions charts/traces/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ opentelemetry-collector:
# opentelemetry-collector configuration
config:
exporters:
logging:
loglevel: info
debug: {}
otlphttp:
endpoint: '{{ include "observe.collectionEndpoint" . }}{{ .Values.global.observe.otelPath }}'
headers:
Expand Down Expand Up @@ -149,12 +148,12 @@ opentelemetry-collector:
traces:
receivers: [otlp, zipkin]
processors: [probabilistic_sampler, k8sattributes, memory_limiter, batch]
exporters: [otlphttp, logging]
exporters: [otlphttp, debug]
metrics:
receivers: [otlp]
processors: [k8sattributes, memory_limiter, batch]
exporters: [otlphttp, logging]
exporters: [otlphttp, debug]
logs:
receivers: [otlp]
processors: [k8sattributes, memory_limiter, batch]
exporters: [otlphttp, logging]
exporters: [otlphttp, debug]
2 changes: 1 addition & 1 deletion examples/agent/logs/sample-log-pods.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -271,4 +271,4 @@ spec:
volumes:
- name: script-volume
configMap:
name: log-generator-script
name: log-generator-script
4 changes: 2 additions & 2 deletions examples/stack/logs/multi_line/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

See line 4-19 helm-charts/examples/agent/logs/README.md for instruction on how to deploy sample pods.

## Deploy collection
## Deploy collection
Assumes metrics pod not deployed

Assumes observe namespace created
Expand All @@ -11,4 +11,4 @@ helm install --namespace=observe observe-stack observe/stack \
--set global.observe.collectionEndpoint="https://12345678.observeinc.com/v1/http" \
--set observe.token.value="dsabcdefghijk:qrstuvwzyz" \
-f ./multiline-values.yaml
```
```
2 changes: 0 additions & 2 deletions examples/stack/logs/multi_line/multiline-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,5 +208,3 @@ logs:
# --------|----------------|--------------------------------------------------
rule "start_state" "/^[\d]+/" "cont"
rule "cont" "/(\bThis\b)|(\bAnd\b).*/" "cont"

0 comments on commit 2cb3e13

Please sign in to comment.