From 12775caa5f3a2d941946af6780258f6a7604312c Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Mon, 27 Jan 2025 13:01:36 -0300 Subject: [PATCH] chore: change org path (#43) --- .github/CODEOWNERS | 1 + .github/workflows/main.yaml | 2 +- .github/workflows/release.yaml | 4 ++-- Makefile | 6 +++--- README.md | 16 ++++++++-------- SECURITY.md | 5 +++++ cmd/main.go | 4 ++-- docker/Dockerfile | 2 +- go.mod | 2 +- otlpinf/otlpinf.go | 4 ++-- otlpinf/otlpinf_test.go | 2 +- otlpinf/server.go | 4 ++-- runner/runner.go | 2 +- runner/runner_test.go | 2 +- 14 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 .github/CODEOWNERS create mode 100644 SECURITY.md diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..1d17aa2 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +@leoparente @ltucker @mfiedorowicz \ No newline at end of file diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 498b6ea..db5b4da 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -65,4 +65,4 @@ jobs: - name: Push opentelemetry-infinity container run: | - docker push -a ghcr.io/leoparente/opentelemetry-infinity + docker push -a netboxlabs/opentelemetry-infinity diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1454043..90fa6b6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,7 +15,7 @@ jobs: run: | OTEL_LATEST_RELEASE=$(curl -L -s -H 'Accept: application/json' https://github.com/open-telemetry/opentelemetry-collector-releases/releases/latest) OTEL_LATEST_VERSION=$(echo $OTEL_LATEST_RELEASE | sed -e 's/.*"tag_name":"\([^"]*\)".*/\1/') - INF_LATEST_RELEASE=$(curl -L -s -H 'Accept: application/json' https://github.com/leoparente/opentelemetry-infinity/releases/latest) + INF_LATEST_RELEASE=$(curl -L -s -H 'Accept: application/json' https://github.com/netboxlabs/opentelemetry-infinity/releases/latest) INF_LATEST_VERSION=$(echo $INF_LATEST_RELEASE | sed -e 's/.*"tag_name":"\([^"]*\)".*/\1/') release='' if [[ $OTEL_LATEST_VERSION != $INF_LATEST_VERSION ]]; then @@ -93,4 +93,4 @@ jobs: - name: Push opentelemetry-infinity container run: | - docker push -a ghcr.io/leoparente/opentelemetry-infinity + docker push -a netboxlabs/opentelemetry-infinity diff --git a/Makefile b/Makefile index 9fa5ca7..34ec6dd 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,13 @@ VERSION ?= $(shell runner/otelcol-contrib -v | cut -d ' ' -f 3) BUILD_DIR = build CGO_ENABLED ?= 0 GOARCH ?= $(shell go env GOARCH) -DOCKERHUB_REPO = ghcr.io/leoparente +DOCKERHUB_REPO = netboxlabs COMMIT_HASH = $(shell git rev-parse --short HEAD) -INF_LATEST_RELEASE := $(shell curl -L -s -H 'Accept: application/json' https://github.com/leoparente/opentelemetry-infinity/releases/latest) +INF_LATEST_RELEASE := $(shell curl -L -s -H 'Accept: application/json' https://github.com/netboxlabs/opentelemetry-infinity/releases/latest) INF_LATEST_VERSION := $(shell echo $(INF_LATEST_RELEASE) | sed -e 's/.*tag_name:\([^,]*\).*/\1/') getotelcol: - wget -O /tmp/otelcol-contrib-$(GOARCH)$(GOARM).zip https://github.com/leoparente/opentelemetry-infinity/releases/download/$(INF_LATEST_VERSION)/otelcol-contrib-$(GOARCH)$(GOARM).zip + wget -O /tmp/otelcol-contrib-$(GOARCH)$(GOARM).zip https://github.com/netboxlabs/opentelemetry-infinity/releases/download/$(INF_LATEST_VERSION)/otelcol-contrib-$(GOARCH)$(GOARM).zip unzip /tmp/otelcol-contrib-$(GOARCH)$(GOARM).zip -d /tmp/ mv /tmp/otelcol-contrib runner/otelcol-contrib rm -rf /tmp/otelcol-contrib* diff --git a/README.md b/README.md index d48bd45..563cbce 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,12 @@
-[![Build status](https://github.com/leoparente/opentelemetry-infinity/workflows/otel-main/badge.svg)](https://github.com/leoparente/opentelemetry-infinity/actions) -[![CodeQL](https://github.com/leoparente/opentelemetry-infinity/workflows/CodeQL/badge.svg)](https://github.com/leoparente/opentelemetry-infinity/security/code-scanning) +[![Build status](https://github.com/netboxlabs/opentelemetry-infinity/workflows/otel-main/badge.svg)](https://github.com/netboxlabs/opentelemetry-infinity/actions) +[![CodeQL](https://github.com/netboxlabs/opentelemetry-infinity/workflows/CodeQL/badge.svg)](https://github.com/netboxlabs/opentelemetry-infinity/security/code-scanning) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=leoparente_opentelemetry-infinity&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=leoparente_opentelemetry-infinity) -[![CodeCov](https://codecov.io/gh/leoparente/opentelemetry-infinity/branch/main/graph/badge.svg)](https://app.codecov.io/gh/leoparente/opentelemetry-infinity/tree/main) -[![Go Report Card](https://goreportcard.com/badge/github.com/leoparente/opentelemetry-infinity)](https://goreportcard.com/report/github.com/leoparente/opentelemetry-infinity) -![GitHub release (latest by date)](https://img.shields.io/github/v/release/leoparente/opentelemetry-infinity) +[![CodeCov](https://codecov.io/gh/netboxlabs/opentelemetry-infinity/branch/main/graph/badge.svg)](https://app.codecov.io/gh/netboxlabs/opentelemetry-infinity/tree/main) +[![Go Report Card](https://goreportcard.com/badge/github.com/netboxlabs/opentelemetry-infinity)](https://goreportcard.com/report/github.com/netboxlabs/opentelemetry-infinity) +![GitHub release (latest by date)](https://img.shields.io/github/v/release/netboxlabs/opentelemetry-infinity)

@@ -38,12 +38,12 @@ Opentelemetry Infinity provide [otel-collector-contrib](https://github.com/open- ## Docker Image You can download and run using docker image: ``` -docker run --net=host ghcr.io/leoparente/opentelemetry-infinity run +docker run --net=host netboxlabs/opentelemetry-infinity run ``` ## Command Line Interface (CLI) Opentelemetry Infinity allows some start up configuration that is listed below. It disables `opentelemetry-collector` self telemetry by default to avoid port conflict. If you want to enable it back, be aware to handle it properly when starting more that one `otelcol-contrib`, i.e., applying more than one policy. ```sh -docker run --net=host ghcr.io/leoparente/opentelemetry-infinity run --help +docker run --net=host netboxlabs/opentelemetry-infinity run --help Run opentelemetry-infinity @@ -62,7 +62,7 @@ Flags: ## REST API The default `otlpinf` address is `localhost:10222`. to change that you can specify host and port when starting `otlpinf`: ```sh -docker run --net=host ghcr.io/leoparente/opentelemetry-infinity run -a {host} -p {port} +docker run --net=host netboxlabs/opentelemetry-infinity run -a {host} -p {port} ``` ### Routes (v1) diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..3dd2d6f --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,5 @@ +# Security Policy + +## Reporting a Vulnerability + +Please send any suspected vulnerability report to security@netboxlabs.com \ No newline at end of file diff --git a/cmd/main.go b/cmd/main.go index 02bb49f..8269eda 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -8,8 +8,8 @@ import ( "strings" "syscall" - "github.com/leoparente/opentelemetry-infinity/config" - "github.com/leoparente/opentelemetry-infinity/otlpinf" + "github.com/netboxlabs/opentelemetry-infinity/config" + "github.com/netboxlabs/opentelemetry-infinity/otlpinf" "github.com/spf13/cobra" "github.com/spf13/viper" "go.uber.org/zap" diff --git a/docker/Dockerfile b/docker/Dockerfile index 070297e..89120dc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.23-alpine AS builder ARG GOARCH ARG GOARM -WORKDIR /go/src/github.com/leoparente/opentelemetry-infinity +WORKDIR /go/src/github.com/netboxlabs/opentelemetry-infinity COPY . . RUN apk update && apk add build-base curl dpkg-dev make RUN if [ ! -f "runner/otelcol-contrib" ] ; then make getotelcol ; fi diff --git a/go.mod b/go.mod index e739151..7a7da07 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/leoparente/opentelemetry-infinity +module github.com/netboxlabs/opentelemetry-infinity go 1.20 diff --git a/otlpinf/otlpinf.go b/otlpinf/otlpinf.go index 4116fb3..131856b 100644 --- a/otlpinf/otlpinf.go +++ b/otlpinf/otlpinf.go @@ -6,8 +6,8 @@ import ( "time" "github.com/gin-gonic/gin" - "github.com/leoparente/opentelemetry-infinity/config" - "github.com/leoparente/opentelemetry-infinity/runner" + "github.com/netboxlabs/opentelemetry-infinity/config" + "github.com/netboxlabs/opentelemetry-infinity/runner" "go.uber.org/zap" "gopkg.in/yaml.v3" ) diff --git a/otlpinf/otlpinf_test.go b/otlpinf/otlpinf_test.go index a668a2c..b91b50a 100644 --- a/otlpinf/otlpinf_test.go +++ b/otlpinf/otlpinf_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/leoparente/opentelemetry-infinity/config" + "github.com/netboxlabs/opentelemetry-infinity/config" "go.uber.org/zap/zaptest" "gopkg.in/yaml.v2" ) diff --git a/otlpinf/server.go b/otlpinf/server.go index 77d2d28..3ff5599 100644 --- a/otlpinf/server.go +++ b/otlpinf/server.go @@ -11,8 +11,8 @@ import ( yson "github.com/ghodss/yaml" ginzap "github.com/gin-contrib/zap" "github.com/gin-gonic/gin" - "github.com/leoparente/opentelemetry-infinity/config" - "github.com/leoparente/opentelemetry-infinity/runner" + "github.com/netboxlabs/opentelemetry-infinity/config" + "github.com/netboxlabs/opentelemetry-infinity/runner" "go.uber.org/zap" "gopkg.in/yaml.v3" ) diff --git a/runner/runner.go b/runner/runner.go index 17591ea..885e326 100644 --- a/runner/runner.go +++ b/runner/runner.go @@ -13,7 +13,7 @@ import ( "time" "github.com/amenzhinsky/go-memexec" - "github.com/leoparente/opentelemetry-infinity/config" + "github.com/netboxlabs/opentelemetry-infinity/config" "go.uber.org/zap" "gopkg.in/yaml.v3" ) diff --git a/runner/runner_test.go b/runner/runner_test.go index cedf72b..85dd84a 100644 --- a/runner/runner_test.go +++ b/runner/runner_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/leoparente/opentelemetry-infinity/config" + "github.com/netboxlabs/opentelemetry-infinity/config" "go.uber.org/zap/zaptest" "gopkg.in/yaml.v2" )