feat: Update Unix install script (#1757)

* update unix install scripts

* dedup messages

* docker updates

* docker working

* rename to supervisor.yaml, add pre & post remove scripts, remove uninstall section, update entrypoint for docker images

* update permission for supervisor cfg

* new supervisor storage changes

* use INSTALL_DIR const

* messing around with pre-post scripts

* use shell formatter & finalize scripts

* remove returns, update msg, remove log dir creation in goreleaser

* move supervisors files creation into goreleaser

* only pull most recent contrib commit, change replace to internal pkg for gcp exporters

* chown opampsupervisor

* remove user var

.goreleaser.yml

@@ -160,6 +160,7 @@ nfpms:
           mode: 0755
           owner: observiq-otel-collector
           group: observiq-otel-collector
+      # TODO: (dakota) evaluate this file once supervisor has support for configuring agent logging
       - src: release_deps/logging.yaml
         dst: /opt/observiq-otel-collector/logging.yaml
         file_info:
@@ -204,12 +205,16 @@ nfpms:
           mode: 0750
           owner: observiq-otel-collector
           group: observiq-otel-collector
-      - dst: /opt/observiq-otel-collector/log
+      - dst: /opt/observiq-otel-collector/supervisor_storage
         type: dir
         file_info:
           mode: 0750
           owner: observiq-otel-collector
           group: observiq-otel-collector
+      - dst: /opt/observiq-otel-collector/supervisor_storage/effective.yaml
+        type: ghost
+      - dst: /opt/observiq-otel-collector/supervisor_storage/agent.log
+        type: ghost
       - src: service/observiq-otel-collector.service
         dst: /usr/lib/systemd/system/observiq-otel-collector.service
         type: config|noreplace
@@ -234,6 +239,8 @@ nfpms:
     scripts:
       preinstall: ./scripts/package/preinstall.sh
       postinstall: ./scripts/package/postinstall.sh
+      preremove: ./scripts/package/preremove.sh
+      postremove: ./scripts/package/postremove.sh
 
 # Build container images with docker buildx (mutli arch builds).
 dockers:
@@ -242,6 +249,7 @@ dockers:
     goarch: amd64
     ids:
       - collector
+      - supervisor
     image_templates:
       - "observiq/bindplane-agent-amd64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
       - "ghcr.io/observiq/bindplane-agent-amd64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
@@ -264,6 +272,7 @@ dockers:
     goarch: arm64
     ids:
       - collector
+      - supervisor
     image_templates:
       - "observiq/bindplane-agent-arm64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
       - "ghcr.io/observiq/bindplane-agent-arm64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
@@ -286,6 +295,7 @@ dockers:
     goarch: amd64
     ids:
       - collector
+      - supervisor
     image_templates:
       - "observiq/observiq-otel-collector-amd64:latest"
       - "observiq/observiq-otel-collector-amd64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
@@ -331,6 +341,7 @@ dockers:
     goarch: arm64
     ids:
       - collector
+      - supervisor
     image_templates:
       - "observiq/observiq-otel-collector-arm64:latest"
       - "observiq/observiq-otel-collector-arm64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
@@ -377,6 +388,7 @@ dockers:
     goarch: amd64
     ids:
       - collector
+      - supervisor
     image_templates:
       - "observiq/observiq-otel-collector-amd64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-ubi8"
       - "ghcr.io/observiq/observiq-otel-collector-amd64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-ubi8"
@@ -404,6 +416,7 @@ dockers:
     goarch: arm64
     ids:
       - collector
+      - supervisor
     image_templates:
       - "observiq/observiq-otel-collector-arm64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-ubi8"
       - "ghcr.io/observiq/observiq-otel-collector-arm64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-ubi8"

Makefile

@@ -54,7 +54,7 @@ updater:
 # Runs the supervisor invoking the agent build in /dist
 .PHONY: run-supervisor
 run-supervisor:
-	opampsupervisor --config ./local/supervisor-config.yaml
+	opampsupervisor --config ./local/supervisor.yaml
 
 # Ensures the supervisor and agent are stopped
 .PHONY: kill

buildscripts/download-dependencies.sh

@@ -35,7 +35,7 @@ SUPERVISOR_REPO="https://github.com/open-telemetry/opentelemetry-collector-contr
 PLATFORMS=("linux/amd64" "linux/arm64" "linux/arm" "linux/ppc64" "linux/ppc64le" "darwin/amd64" "darwin/arm64" "windows/amd64")
 
 mkdir "$DOWNLOAD_DIR/supervisor_bin"
-$(cd $DOWNLOAD_DIR && git clone "$SUPERVISOR_REPO")
+$(cd $DOWNLOAD_DIR && git clone --depth 1 "$SUPERVISOR_REPO")
 cd "$DOWNLOAD_DIR/opentelemetry-collector-contrib/cmd/opampsupervisor"
 go get github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor
 for PLATFORM in "${PLATFORMS[@]}"; do

docker/Dockerfile.scratch

@@ -37,10 +37,11 @@ COPY --from=stage --chown=otel:otel /etc/otel /etc/otel
 COPY --from=stage --chown=otel:otel /etc/otel/storage /etc/otel/storage
 
 COPY observiq-otel-collector /collector/observiq-otel-collector
+COPY opampsupervisor /collector/opampsupervisor
 
 ENV OIQ_OTEL_COLLECTOR_HOME=/etc/otel
 ENV OIQ_OTEL_COLLECTOR_STORAGE=/etc/otel/storage
 
 USER otel
 WORKDIR /etc/otel
-ENTRYPOINT ["/collector/observiq-otel-collector"]
+ENTRYPOINT [ "/collector/opampsupervisor", "--config", "/etc/otel/supervisor.yaml" ]

docker/Dockerfile.ubi8

@@ -57,6 +57,8 @@ COPY LICENSE /licenses/observiq-otel-collector.license
 COPY release_deps/VERSION.txt /etc/otel/VERSION.txt
 
 COPY observiq-otel-collector /collector/observiq-otel-collector
+COPY opampsupervisor /collector/opampsupervisor
+
 COPY release_deps/opentelemetry-java-contrib-jmx-metrics.jar /opt/opentelemetry-java-contrib-jmx-metrics.jar
 COPY release_deps/plugins /etc/otel/plugins
 
@@ -71,6 +73,4 @@ RUN chmod 0600 \
 USER otel
 WORKDIR /etc/otel
 
-# User should mount /etc/otel/config.yaml at runtime using docker volumes / k8s configmap unless
-# connecting to an OpAMP platform.
-ENTRYPOINT [ "/collector/observiq-otel-collector" ]
+ENTRYPOINT [ "/collector/opampsupervisor", "--config", "/etc/otel/supervisor.yaml" ]

docker/Dockerfile.ubuntu

@@ -58,6 +58,8 @@ COPY LICENSE /licenses/observiq-otel-collector.license
 COPY release_deps/VERSION.txt /etc/otel/VERSION.txt
 
 COPY observiq-otel-collector /collector/observiq-otel-collector
+COPY opampsupervisor /collector/opampsupervisor
+
 COPY release_deps/opentelemetry-java-contrib-jmx-metrics.jar /opt/opentelemetry-java-contrib-jmx-metrics.jar
 COPY release_deps/plugins /etc/otel/plugins
 
@@ -72,6 +74,4 @@ RUN chmod 0600 \
 USER otel
 WORKDIR /etc/otel
 
-# User should mount /etc/otel/config.yaml at runtime using docker volumes / k8s configmap unless
-# connecting to an OpAMP platform.
-ENTRYPOINT [ "/collector/observiq-otel-collector" ]
+ENTRYPOINT [ "/collector/opampsupervisor", "--config", "/etc/otel/supervisor.yaml" ]

exporter/googlecloudexporter/go.mod

@@ -99,4 +99,4 @@ require (
 )
 
 // Needed until 'version' package changes are included in a release
-replace github.com/observiq/bindplane-agent/internal/version v1.56.0 => github.com/observiq/bindplane-agent/internal/version v0.0.0-20240717172323-a1d3e6ed4aab
+replace github.com/observiq/bindplane-agent/internal/version => ../../internal/version

exporter/googlecloudexporter/go.sum

@@ -256,8 +256,6 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk=
-github.com/observiq/bindplane-agent/internal/version v0.0.0-20240717172323-a1d3e6ed4aab h1:sj9huSMQ9MqOWRGJ1OJtIhpXZZpg1OoB8YvJ3kBCYlg=
-github.com/observiq/bindplane-agent/internal/version v0.0.0-20240717172323-a1d3e6ed4aab/go.mod h1:TfycUeyrZvoFI6crSlts5HxdHgxYtoYaXwSZ2ZQIj5I=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.113.0 h1:aomBl+rFWqedr0EePjovG0VQnqrEzsOJTtKgPSVa70w=
 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.113.0/go.mod h1:RmVx108AyAbiRDe43i3yvJpwDpIZxNNrn0aN4Vxy//8=

exporter/googlemanagedprometheusexporter/go.mod

@@ -98,4 +98,4 @@ require (
 )
 
 // Needed until 'version' package changes are included in a release
-replace github.com/observiq/bindplane-agent/internal/version v1.56.0 => github.com/observiq/bindplane-agent/internal/version v0.0.0-20240717172323-a1d3e6ed4aab
+replace github.com/observiq/bindplane-agent/internal/version => ../../internal/version

exporter/googlemanagedprometheusexporter/go.sum

@@ -274,8 +274,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk=
-github.com/observiq/bindplane-agent/internal/version v0.0.0-20240717172323-a1d3e6ed4aab h1:sj9huSMQ9MqOWRGJ1OJtIhpXZZpg1OoB8YvJ3kBCYlg=
-github.com/observiq/bindplane-agent/internal/version v0.0.0-20240717172323-a1d3e6ed4aab/go.mod h1:TfycUeyrZvoFI6crSlts5HxdHgxYtoYaXwSZ2ZQIj5I=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.113.0 h1:yLkgJN2Jf9WwGiCO3zwaRLBE1hHkBrPx+xZ0wQfrHT4=
 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.113.0/go.mod h1:KpC56fV+8M22+JEum4pnTCVfPgTLIr6YV0Tsdbad+Mw=

manifests/minimal/manifest.yaml

@@ -4,26 +4,26 @@ dist:
   description: ObservIQ's minimal distro for OpenTelemetry Collector
   version: "v0.0.1"
   output_path: ./dist
-  otelcol_version: 0.105.0
+  otelcol_version: 0.106.1
 
 conf_resolver:
   default_uri_scheme: "env"
 
 extensions:
-  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.105.0
-  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampextension v0.105.0
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.106.1
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampextension v0.106.1
   - gomod: github.com/observiq/bindplane-agent/extension/bindplaneextension v1.56.0
     path: "./extension/bindplaneextension"
 
 exporters:
-  - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.105.0
+  - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.106.1
 
 processors:
-  - gomod: github.com/observiq/bindplane-agent/processor/snapshotprocessor v1.56.0
+  - gomod: github.com/observiq/bindplane-agent/processor/snapshotprocessor v1.58.0
     path: "./processor/snapshotprocessor"
 
 receivers:
-  - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.105.0
+  - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.106.1
 
 connectors: []