diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 33eaa48..b5f2b40 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -40,9 +40,9 @@ dockers: # build latest and specific tag version images # https://goreleaser.com/cookbooks/multi-platform-docker-images/#other-things-to-pay-attention-to - image_templates: - - "ghcr.io/wbollock/{{.ProjectName}}:{{ .Tag }}" - - "ghcr.io/wbollock/{{.ProjectName}}:{{ .Tag }}-amd64" - - "ghcr.io/wbollock/{{.ProjectName}}:latest" # keep latest as linux/amd64 + - "ghcr.io/linode_obs/{{.ProjectName}}:{{ .Tag }}" + - "ghcr.io/linode_obs/{{.ProjectName}}:{{ .Tag }}-amd64" + - "ghcr.io/linode_obs/{{.ProjectName}}:latest" # keep latest as linux/amd64 use: buildx goos: linux goarch: amd64 @@ -52,13 +52,13 @@ dockers: - "--label=org.opencontainers.image.title={{.ProjectName}}" - "--label=org.opencontainers.image.revision={{.FullCommit}}" - "--label=org.opencontainers.image.version={{.Version}}" - - "--label=org.opencontainers.image.source=https://github.com/wbollock/ping_exporter" + - "--label=org.opencontainers.image.source=https://github.com/linode_obs/ping_exporter" - "--label=org.opencontainers.image.description='Yet another prometheus ping exporter'" - "--label=org.opencontainers.image.licenses=MIT" - "--platform=linux/amd64" dockerfile: "Dockerfile_goreleaser" - image_templates: - - "ghcr.io/wbollock/{{.ProjectName}}:{{ .Tag }}-linux-arm64" + - "ghcr.io/linode_obs/{{.ProjectName}}:{{ .Tag }}-linux-arm64" use: buildx goos: linux goarch: arm64 @@ -68,7 +68,7 @@ dockers: - "--label=org.opencontainers.image.title={{.ProjectName}}" - "--label=org.opencontainers.image.revision={{.FullCommit}}" - "--label=org.opencontainers.image.version={{.Version}}" - - "--label=org.opencontainers.image.source=https://github.com/wbollock/ping_exporter" + - "--label=org.opencontainers.image.source=https://github.com/linode_obs/ping_exporter" - "--label=org.opencontainers.image.description='Yet another prometheus ping exporter'" - "--label=org.opencontainers.image.licenses=MIT" - "--platform=linux/arm64" @@ -90,7 +90,7 @@ nfpms: description: | Yet another prometheus ping exporter with support for the multi-target export pattern. - homepage: "https://github.com/wbollock/ping_exporter" + homepage: "https://github.com/linode_obs/ping_exporter" license: "MIT" contents: # provided by goreleaser diff --git a/LICENSE b/LICENSE index d8b7e01..8f7bc65 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,13 @@ -MIT License +Copyright 2023 Akamai Technologies, Inc. -Copyright (c) 2023 Will Bollock +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 -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + http://www.apache.org/licenses/LICENSE-2.0 -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +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. diff --git a/README.md b/README.md index 40da933..36611ac 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Prometheus Ping Exporter -![Github Release Downloads](https://img.shields.io/github/downloads/wbollock/ping_exporter/total.svg) -[![license](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/wbollock/ping_exporter/blob/master/LICENSE) -[![golangci-lint](https://github.com/wbollock/ping_exporter/actions/workflows/golangci-lint.yaml/badge.svg)](https://github.com/wbollock/ping_exporter/actions/workflows/golangci-lint.yaml) -![Go Report Card](https://goreportcard.com/badge/github.com/wbollock/ping_exporter) -[![contributions](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat")](https://github.com/wbollock/ping_exporter/issues) +![Github Release Downloads](https://img.shields.io/github/downloads/linode_obs/ping_exporter/total.svg) +[![license](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/linode_obs/ping_exporter/blob/master/LICENSE) +[![golangci-lint](https://github.com/linode_obs/ping_exporter/actions/workflows/golangci-lint.yaml/badge.svg)](https://github.com/linode_obs/ping_exporter/actions/workflows/golangci-lint.yaml) +![Go Report Card](https://goreportcard.com/badge/github.com/linode_obs/ping_exporter) +[![contributions](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat")](https://github.com/linode_obs/ping_exporter/issues) Yet another ping exporter. @@ -111,7 +111,7 @@ scrape_configs: Substitute `{{ version }}` for your desired release. ```bash -wget https://github.com/wbollock/ping_exporter/releases/download/v{{ version }}/prometheus-ping-exporter_{{ version }}_linux_amd64.{deb,rpm} +wget https://github.com/linode_obs/ping_exporter/releases/download/v{{ version }}/prometheus-ping-exporter_{{ version }}_linux_amd64.{deb,rpm} {dpkg,rpm} -i prometheus-ping-exporter_{{ version }}_linux_amd64.{deb,rpm} ``` @@ -120,13 +120,13 @@ wget https://github.com/wbollock/ping_exporter/releases/download/v{{ version }}/ ```console sudo docker run \ --privileged \ -ghcr.io/wbollock/ping_exporter +ghcr.io/linode_obs/ping_exporter ``` ### Binary ```bash -wget https://github.com/wbollock/ping_exporter/releases/download/v{{ version }}/ping_exporter_{{ version }}_Linux_x86_64.tar.gz +wget https://github.com/linode_obs/ping_exporter/releases/download/v{{ version }}/ping_exporter_{{ version }}_Linux_x86_64.tar.gz tar xvf ping_exporter_{{ version }}_Linux_x86_64.tar.gz ./ping_exporter/prometheus-ping-exporter ``` @@ -134,7 +134,7 @@ tar xvf ping_exporter_{{ version }}_Linux_x86_64.tar.gz ### Source ```bash -wget https://github.com/wbollock/ping_exporter/archive/refs/tags/v{{ version }}.tar.gz +wget https://github.com/linode_obs/ping_exporter/archive/refs/tags/v{{ version }}.tar.gz tar xvf ping_exporter-{{ version }}.tar.gz cd ./ping_exporter-{{ version }} go build ping_exporter.go diff --git a/cmd/main.go b/cmd/main.go index ff0f065..2df774b 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -6,10 +6,10 @@ import ( "net/http" "os" + "github.com/linode_obs/ping_exporter/internal/server" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" log "github.com/sirupsen/logrus" - "github.com/wbollock/ping_exporter/internal/server" ) const ( diff --git a/go.mod b/go.mod index 9442f08..93b6004 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/wbollock/ping_exporter +module github.com/linode_obs/ping_exporter go 1.21.0 diff --git a/internal/collector/icmp_collector.go b/internal/collector/icmp_collector.go index 15d2360..c676dc3 100644 --- a/internal/collector/icmp_collector.go +++ b/internal/collector/icmp_collector.go @@ -6,11 +6,11 @@ import ( "strings" "time" + "github.com/linode_obs/ping_exporter/internal/metrics" probing "github.com/prometheus-community/pro-bing" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" log "github.com/sirupsen/logrus" - "github.com/wbollock/ping_exporter/internal/metrics" ) type pingParams struct { diff --git a/internal/server/server.go b/internal/server/server.go index aae60de..81928a9 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -5,9 +5,9 @@ import ( "net/http" "net/http/pprof" + "github.com/linode_obs/ping_exporter/internal/collector" "github.com/prometheus/client_golang/prometheus/promhttp" log "github.com/sirupsen/logrus" - "github.com/wbollock/ping_exporter/internal/collector" ) func SetupServer() http.Handler { diff --git a/nfpm/systemd/prometheus-ping-exporter.service b/nfpm/systemd/prometheus-ping-exporter.service index 71d5304..d11fb71 100644 --- a/nfpm/systemd/prometheus-ping-exporter.service +++ b/nfpm/systemd/prometheus-ping-exporter.service @@ -1,6 +1,6 @@ [Unit] Description=Prometheus Ping Exporter -Documentation=https://github.com/wbollock/ping_exporter +Documentation=https://github.com/linode_obs/ping_exporter Wants=network-online.target After=network-online.target diff --git a/test/integration_test.go b/test/integration_test.go index e71c58d..5ae73b3 100644 --- a/test/integration_test.go +++ b/test/integration_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/wbollock/ping_exporter/internal/server" + "github.com/linode_obs/ping_exporter/internal/server" ) const expectedStatusCode = 200