From cb83bb24ff08e8e75efe57b9aa5e14ff8714d7de Mon Sep 17 00:00:00 2001 From: Szilard Parrag Date: Tue, 13 Feb 2024 14:35:54 +0100 Subject: [PATCH] chore(renaming): axoflow-otel-collector Signed-off-by: Szilard Parrag --- .goreleaser.yaml | 20 ++++---- README.md | 8 +-- cmd/goreleaser/internal/configure.go | 2 +- configs/otelcol.yaml | 71 --------------------------- distributions/otelcol/Dockerfile | 14 ------ distributions/otelcol/README.md | 7 --- distributions/otelcol/manifest.yaml | 46 ----------------- distributions/otelcol/otelcol.conf | 5 -- distributions/otelcol/otelcol.service | 15 ------ distributions/otelcol/postinstall.sh | 22 --------- distributions/otelcol/preinstall.sh | 17 ------- distributions/otelcol/preremove.sh | 20 -------- 12 files changed, 13 insertions(+), 234 deletions(-) delete mode 100644 configs/otelcol.yaml delete mode 100644 distributions/otelcol/Dockerfile delete mode 100644 distributions/otelcol/README.md delete mode 100644 distributions/otelcol/manifest.yaml delete mode 100644 distributions/otelcol/otelcol.conf delete mode 100644 distributions/otelcol/otelcol.service delete mode 100755 distributions/otelcol/postinstall.sh delete mode 100755 distributions/otelcol/preinstall.sh delete mode 100755 distributions/otelcol/preremove.sh diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 0cae7ec0..afe83b24 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -27,8 +27,8 @@ dockers: goarch: amd64 dockerfile: distributions/otelcol-contrib/Dockerfile image_templates: - - ghcr.io/axoflow/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64 - - ghcr.io/axoflow/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64 + - ghcr.io/axoflow/axoflow-otel-collector/opentelemetry-collector-contrib:{{ .Version }}-amd64 + - ghcr.io/axoflow/axoflow-otel-collector/opentelemetry-collector-contrib:latest-amd64 extra_files: - configs/otelcol-contrib.yaml build_flag_templates: @@ -44,8 +44,8 @@ dockers: goarch: arm64 dockerfile: distributions/otelcol-contrib/Dockerfile image_templates: - - ghcr.io/axoflow/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64 - - ghcr.io/axoflow/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64 + - ghcr.io/axoflow/axoflow-otel-collector/opentelemetry-collector-contrib:{{ .Version }}-arm64 + - ghcr.io/axoflow/axoflow-otel-collector/opentelemetry-collector-contrib:latest-arm64 extra_files: - configs/otelcol-contrib.yaml build_flag_templates: @@ -58,11 +58,11 @@ dockers: - --label=org.opencontainers.image.source={{.GitURL}} use: buildx docker_manifests: - - name_template: ghcr.io/axoflow/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }} + - name_template: ghcr.io/axoflow/axoflow-otel-collector/opentelemetry-collector-contrib:{{ .Version }} image_templates: - - ghcr.io/axoflow/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64 - - ghcr.io/axoflow/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64 - - name_template: ghcr.io/axoflow/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest + - ghcr.io/axoflow/axoflow-otel-collector/opentelemetry-collector-contrib:{{ .Version }}-amd64 + - ghcr.io/axoflow/axoflow-otel-collector/opentelemetry-collector-contrib:{{ .Version }}-arm64 + - name_template: ghcr.io/axoflow/axoflow-otel-collector/opentelemetry-collector-contrib:latest image_templates: - - ghcr.io/axoflow/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64 - - ghcr.io/axoflow/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64 + - ghcr.io/axoflow/axoflow-otel-collector/opentelemetry-collector-contrib:latest-amd64 + - ghcr.io/axoflow/axoflow-otel-collector/opentelemetry-collector-contrib:latest-arm64 diff --git a/README.md b/README.md index ec4dc033..0e2a874e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -# OpenTelemetry Collector distributions - -> :warning: **Important note:** Git tags in this repository may change at any time to fix any issues found during a release. They are only meant to trigger Github releases and should not be relied upon. +# Axoflow Distribution for OpenTelemetry Collector This repository assembles OpenTelemetry Collector distributions, such as the "core" distribution, or "contrib". It may contain non-official distributions, focused on specific use-cases, such as the load-balancer. @@ -8,11 +6,9 @@ Each distribution contains: - Binaries for a multitude of platforms and architectures (at least linux_amd64, linux_arm64, windows_amd64 and darwin_arm64) - Multi-arch container images (at least amd64 and arm64) -- Packages to be used with Linux distributions (apk, RPM, deb), Mac OS (brew) for the above-mentioned architectures More details about each individual distribution can be seen in its own readme files. Current list of distributions: -- [OpenTelemetry Collector (also known as "otelcol")](./distributions/otelcol) -- [OpenTelemetry Collector Contrib (also known as "otelcol-contrib")](./distributions/otelcol-contrib) +- [Axoflow Distribution for OpenTelemetry Collector (also known as "axoflow-otel-collector")](./distributions/otelcol-contrib) diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go index 73ab64e7..3af8a7ff 100644 --- a/cmd/goreleaser/internal/configure.go +++ b/cmd/goreleaser/internal/configure.go @@ -31,7 +31,7 @@ import ( const ArmArch = "arm" var ( - ImagePrefixes = []string{"ghcr.io/axoflow/opentelemetry-collector-releases"} + ImagePrefixes = []string{"ghcr.io/axoflow/axoflow-otel-collector"} Architectures = []string{"amd64", "arm64"} ArmVersions = []string{} ) diff --git a/configs/otelcol.yaml b/configs/otelcol.yaml deleted file mode 100644 index b3beb48e..00000000 --- a/configs/otelcol.yaml +++ /dev/null @@ -1,71 +0,0 @@ -# To limit exposure to denial of service attacks, change the host in endpoints below from 0.0.0.0 to a specific network interface. -# See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/security-best-practices.md#safeguards-against-denial-of-service-attacks - -extensions: - health_check: - pprof: - endpoint: 0.0.0.0:1777 - zpages: - endpoint: 0.0.0.0:55679 - -receivers: - otlp: - protocols: - grpc: - endpoint: 0.0.0.0:4317 - http: - endpoint: 0.0.0.0:4318 - - opencensus: - endpoint: 0.0.0.0:55678 - - # Collect own metrics - prometheus: - config: - scrape_configs: - - job_name: 'otel-collector' - scrape_interval: 10s - static_configs: - - targets: ['0.0.0.0:8888'] - - jaeger: - protocols: - grpc: - endpoint: 0.0.0.0:14250 - thrift_binary: - endpoint: 0.0.0.0:6832 - thrift_compact: - endpoint: 0.0.0.0:6831 - thrift_http: - endpoint: 0.0.0.0:14268 - - zipkin: - endpoint: 0.0.0.0:9411 - -processors: - batch: - -exporters: - debug: - verbosity: detailed - -service: - - pipelines: - - traces: - receivers: [otlp, opencensus, jaeger, zipkin] - processors: [batch] - exporters: [debug] - - metrics: - receivers: [otlp, opencensus, prometheus] - processors: [batch] - exporters: [debug] - - logs: - receivers: [otlp] - processors: [batch] - exporters: [debug] - - extensions: [health_check, pprof, zpages] diff --git a/distributions/otelcol/Dockerfile b/distributions/otelcol/Dockerfile deleted file mode 100644 index c3160d83..00000000 --- a/distributions/otelcol/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM alpine:3.16 as certs -RUN apk --update add ca-certificates - -FROM scratch - -ARG USER_UID=10001 -USER ${USER_UID} - -COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --chmod=755 otelcol /otelcol -COPY configs/otelcol.yaml /etc/otelcol/config.yaml -ENTRYPOINT ["/otelcol"] -CMD ["--config", "/etc/otelcol/config.yaml"] -EXPOSE 4317 55678 55679 diff --git a/distributions/otelcol/README.md b/distributions/otelcol/README.md deleted file mode 100644 index b44218de..00000000 --- a/distributions/otelcol/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# OpenTelemetry Collector Distro - -This distribution contains all the components from the [OpenTelemetry Collector](https://github.com/open-telemetry/opentelemetry-collector) repository and a small selection of components tied to open source projects from the [OpenTelemetry Collector Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib) repository. - -## Components - -The full list of components is available in the [manifest](manifest.yaml) diff --git a/distributions/otelcol/manifest.yaml b/distributions/otelcol/manifest.yaml deleted file mode 100644 index f090c343..00000000 --- a/distributions/otelcol/manifest.yaml +++ /dev/null @@ -1,46 +0,0 @@ -dist: - module: github.com/open-telemetry/opentelemetry-collector-releases/core - name: otelcol - description: OpenTelemetry Collector - version: 0.94.0 - output_path: ./_build - otelcol_version: 0.94.1 - -receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.94.1 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.94.0 - -exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.94.1 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.94.1 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.94.1 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.94.1 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.94.0 - -extensions: - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.94.1 - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.94.1 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.94.0 - -processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.94.1 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.94.1 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.94.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.94.0 - -connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.94.1 diff --git a/distributions/otelcol/otelcol.conf b/distributions/otelcol/otelcol.conf deleted file mode 100644 index 567cf8c1..00000000 --- a/distributions/otelcol/otelcol.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Systemd environment file for the otelcol service - -# Command-line options for the otelcol service. -# Run `/usr/bin/otelcol --help` to see all available options. -OTELCOL_OPTIONS="--config=/etc/otelcol/config.yaml" diff --git a/distributions/otelcol/otelcol.service b/distributions/otelcol/otelcol.service deleted file mode 100644 index f3c4e62e..00000000 --- a/distributions/otelcol/otelcol.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=OpenTelemetry Collector -After=network.target - -[Service] -EnvironmentFile=/etc/otelcol/otelcol.conf -ExecStart=/usr/bin/otelcol $OTELCOL_OPTIONS -KillMode=mixed -Restart=on-failure -Type=simple -User=otel -Group=otel - -[Install] -WantedBy=multi-user.target diff --git a/distributions/otelcol/postinstall.sh b/distributions/otelcol/postinstall.sh deleted file mode 100755 index deb601cd..00000000 --- a/distributions/otelcol/postinstall.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# Copyright The OpenTelemetry Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if command -v systemctl >/dev/null 2>&1; then - systemctl enable otelcol.service - if [ -f /etc/otelcol/config.yaml ]; then - systemctl start otelcol.service - fi -fi diff --git a/distributions/otelcol/preinstall.sh b/distributions/otelcol/preinstall.sh deleted file mode 100755 index e90d69fa..00000000 --- a/distributions/otelcol/preinstall.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# Copyright The OpenTelemetry Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -getent passwd otel >/dev/null || useradd --system --user-group --no-create-home --shell /sbin/nologin otel diff --git a/distributions/otelcol/preremove.sh b/distributions/otelcol/preremove.sh deleted file mode 100755 index 363e4de7..00000000 --- a/distributions/otelcol/preremove.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# Copyright The OpenTelemetry Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if command -v systemctl >/dev/null 2>&1; then - systemctl stop otelcol.service - systemctl disable otelcol.service -fi