Skip to content
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.

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

chore: misc. changes to make the receiver release ready #7

Merged
merged 7 commits into from
Aug 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 41 additions & 0 deletions .github/workflows/ci-latest-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: ci-latest-release

on:
push:
branches:
- "main"
- "v*"
paths:
- "example/**"
- "kubearmor_receiver/**"
- "stanza_input_operator/**"

env:
PLATFORMS: linux/amd64,linux/arm64/v8

jobs:
build:
name: Publish otel-receiver latest Docker image
if: github.repository == 'kubearmor/otel-receiver'
runs-on: ubuntu-22.04
timeout-minutes: 30
steps:
- uses: actions/checkout@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_AUTHTOK }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
with:
platforms: ${{ env.PLATFORMS }}

- name: Build and push Docker image
run: |
docker buildx build --platform=$PLATFORMS -t=kubearmor/otel-receiver:latest --push .
36 changes: 36 additions & 0 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: ci-test

on:
push:
paths:
- "example/**"
- "kubearmor_receiver/**"
- "stanza_input_operator/**"
pull_request:
branches:
- "main"
paths:
- "example/**"
- "kubearmor_receiver/**"
- "stanza_input_operator/**"

jobs:
build:
name: Build & test otel-receiver
if: github.repository == 'kubearmor/otel-receiver'
runs-on: ubuntu-22.04
timeout-minutes: 30
steps:
- uses: actions/checkout@v3

- uses: actions/setup-go@v3
with:
go-version: "v1.20"

- name: Build otel-receiver
env:
GO111MODULE: on
CGO_ENABLED: 0
run: |
go install go.opentelemetry.io/collector/cmd/builder@latest
builder --config=example/collector-builder.yml
27 changes: 27 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
FROM golang:1.20-alpine3.17 as builder

RUN apk --update add ca-certificates git

WORKDIR /build
COPY . .

ENV GO111MODULE=on
ENV CGO_ENABLED=0

# install ocb and build
RUN go install go.opentelemetry.io/collector/cmd/builder@latest
RUN builder --config=example/collector-builder.yml

FROM scratch

ARG USER_UID=10001

USER ${USER_UID}

COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=builder /build/otel-custom/otelcol-custom /otelcol

COPY ./example/config.yml /otelcol-custom/config.yml

ENTRYPOINT ["/otelcol"]
CMD ["--config", "/otelcol-custom/config.yml"]
21 changes: 0 additions & 21 deletions example/Dockerfile

This file was deleted.

21 changes: 13 additions & 8 deletions example/collector-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,25 @@ dist:
name: otelcol-custom
description: Local OpenTelemetry Collector binary
output_path: ./otel-custom

exporters:
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.74.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.74.0
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.81.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.81.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.81.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.81.0

extensions:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.81.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.81.0

receivers:
- gomod: github.com/kubearmor/OTel-receiver/kubearmor_receiver latest

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.74.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.81.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.81.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.81.0

replaces:
- github.com/kubearmor/OTel-receiver/kubearmor_receiver => ../kubearmor_receiver
- github.com/kubearmor/OTel-receiver/stanza_input_operator => ../stanza_input_operator
15 changes: 9 additions & 6 deletions example/collector-k8-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,23 @@ apiVersion: opentelemetry.io/v1alpha1
kind: OpenTelemetryCollector
metadata:
name: kubearmor-collector
namespace: kube-system
#namespace: kubearmor
spec:
image: kubearmor/otel-receiver
image: kubearmor/otel-receiver:latest
mode: daemonset
imagePullPolicy: Always
config: |
receivers:
kubearmor_receiver:
logfilter: all
endpoint: ${env:KUBEARMOR_SERVICE?default=kubearmor:32767}
logfilter: ${env:LOGFILTER?default=all}

exporters:
logging:
verbosity: detailed
loki:
endpoint: "http://172.19.0.1:3100/loki/api/v1/push"

endpoint: "http://loki.default.svc:3100/loki/api/v1/push"

service:
pipelines:
Expand All @@ -25,7 +29,6 @@ spec:
exporters:
- loki
- logging

env:
- name: KUBEARMOR_SERVICE
value: kubearmor.kube-system.svc:32767
value: kubearmor:32767
9 changes: 7 additions & 2 deletions example/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
receivers:
kubearmor_receiver:
endpoint: :32767
logfilter: all
endpoint: ${env:KUBEARMOR_SERVICE?default=:32767}
logfilter: ${env:LOGFILTER?default=all}

exporters:
logging:
verbosity: detailed
# uncomment for exporting to Loki
#loki:
# endpoint: "http://localhost:3100/loki/api/v1/push"

service:
pipelines:
Expand All @@ -15,3 +18,5 @@ service:
processors: []
exporters:
- logging
# uncomment for exporting to Loki
#- loki
3 changes: 1 addition & 2 deletions example/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,5 @@ services:
- "GF_AUTH_ANONYMOUS_ORG_ROLE=Admin"
ports:
- "3000:3000"

networks:
- loki
- loki
32 changes: 16 additions & 16 deletions example/grafana_dashboard.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"__inputs": [
{
"name": "DS_LOKI-1",
"label": "Loki-1",
"name": "DS_LOKI",
"label": "Loki",
"description": "",
"type": "datasource",
"pluginId": "loki",
Expand Down Expand Up @@ -87,7 +87,7 @@
{
"datasource": {
"type": "loki",
"uid": "${DS_LOKI-1}"
"uid": "${DS_LOKI}"
},
"gridPos": {
"h": 8,
Expand All @@ -110,7 +110,7 @@
{
"datasource": {
"type": "loki",
"uid": "${DS_LOKI-1}"
"uid": "${DS_LOKI}"
},
"editorMode": "builder",
"expr": "{exporter=\"OTLP\"} | json | __error__=``",
Expand All @@ -125,7 +125,7 @@
{
"datasource": {
"type": "loki",
"uid": "${DS_LOKI-1}"
"uid": "${DS_LOKI}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -183,7 +183,7 @@
{
"datasource": {
"type": "loki",
"uid": "${DS_LOKI-1}"
"uid": "${DS_LOKI}"
},
"editorMode": "builder",
"expr": "{exporter=\"OTLP\"}",
Expand Down Expand Up @@ -220,7 +220,7 @@
{
"datasource": {
"type": "loki",
"uid": "${DS_LOKI-1}"
"uid": "${DS_LOKI}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -272,7 +272,7 @@
{
"datasource": {
"type": "loki",
"uid": "${DS_LOKI-1}"
"uid": "${DS_LOKI}"
},
"editorMode": "builder",
"expr": "sum by(label) (count_over_time({exporter=\"OTLP\"} |= `` | json label=\"body.$attribute\" | __error__=`` [$__range]))",
Expand Down Expand Up @@ -307,7 +307,7 @@
{
"datasource": {
"type": "loki",
"uid": "${DS_LOKI-1}"
"uid": "${DS_LOKI}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -362,7 +362,7 @@
{
"datasource": {
"type": "loki",
"uid": "${DS_LOKI-1}"
"uid": "${DS_LOKI}"
},
"editorMode": "builder",
"expr": "sum by(label) (count_over_time({exporter=\"OTLP\"} | json label=\"body.$attribute\" | __error__=`` [$__range]))",
Expand Down Expand Up @@ -397,7 +397,7 @@
{
"datasource": {
"type": "loki",
"uid": "${DS_LOKI-1}"
"uid": "${DS_LOKI}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -464,7 +464,7 @@
{
"datasource": {
"type": "loki",
"uid": "${DS_LOKI-1}"
"uid": "${DS_LOKI}"
},
"editorMode": "builder",
"expr": "sum by(body_$attribute) (count_over_time({exporter=\"OTLP\"} |= `` | json | __error__=`` [$__range]))",
Expand All @@ -490,7 +490,7 @@
{
"datasource": {
"type": "loki",
"uid": "${DS_LOKI-1}"
"uid": "${DS_LOKI}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -540,7 +540,7 @@
{
"datasource": {
"type": "loki",
"uid": "${DS_LOKI-1}"
"uid": "${DS_LOKI}"
},
"editorMode": "builder",
"expr": "sum by(logLevel) (count_over_time({exporter=\"OTLP\"} | json logLevel=\"body.$attribute\" | __error__=`` [$__range]))",
Expand Down Expand Up @@ -616,9 +616,9 @@
"to": "now"
},
"timepicker": {},
"timezone": "Africa/Lagos",
"timezone": "",
"title": "KubeArmor",
"uid": "UohN2UU4k",
"version": 31,
"weekStart": ""
}
}
Loading