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: linode_obs repo transfer; re-license to apache #48

Merged
merged 2 commits into from
Jan 29, 2024
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
2 changes: 1 addition & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
"repoType": "github",
"repoHost": "https://github.com",
"projectName": "nagios_exporter",
"projectOwner": "wbollock"
"projectOwner": "linode_obs"
}
8 changes: 4 additions & 4 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ changelog:
dockers:
# build latest and specific tag version images
- image_templates:
- "ghcr.io/wbollock/{{.ProjectName}}:{{ .Tag }}"
- "ghcr.io/wbollock/{{.ProjectName}}:latest"
- "ghcr.io/linode_obs/{{.ProjectName}}:{{ .Tag }}"
- "ghcr.io/linode_obs/{{.ProjectName}}:latest"
goos: linux
goarch: amd64
use: docker
Expand All @@ -49,7 +49,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/nagios_exporter"
- "--label=org.opencontainers.image.source=https://github.com/linode_obs/nagios_exporter"
- "--label=org.opencontainers.image.description='A Prometheus Exporter for Nagios'"
- "--label=org.opencontainers.image.licenses=MIT"
nfpms:
Expand All @@ -69,7 +69,7 @@ nfpms:
description: |
A Prometheus Nagios Exporter that provides information
on the current state of a Nagios application and configuration.
homepage: "https://github.com/wbollock/nagios_exporter"
homepage: "https://github.com/linode_obs/nagios_exporter"
license: "MIT"
# TODO - changelog?
#changelog: "changelog.yaml"
Expand Down
28 changes: 10 additions & 18 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
MIT License
Copyright 2023 Akamai Technologies, Inc.

Copyright (c) 2022 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.
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

# nagios_exporter

![Github Release Downloads](https://img.shields.io/github/downloads/wbollock/nagios_exporter/total.svg)
[![license](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/wbollock/nagios_exporter/blob/master/LICENSE)
[![golangci-lint](https://github.com/wbollock/nagios_exporter/actions/workflows/golangci-lint.yaml/badge.svg)](https://github.com/wbollock/nagios_exporter/actions/workflows/golangci-lint.yaml)
![Go Report Card](https://goreportcard.com/badge/github.com/wbollock/nagios_exporter)
[![contributions](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat")](https://github.com/wbollock/nagios_exporter/issues)
![Github Release Downloads](https://img.shields.io/github/downloads/linode_obs/nagios_exporter/total.svg)
[![license](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/linode_obs/nagios_exporter/blob/master/LICENSE)
[![golangci-lint](https://github.com/linode_obs/nagios_exporter/actions/workflows/golangci-lint.yaml/badge.svg)](https://github.com/linode_obs/nagios_exporter/actions/workflows/golangci-lint.yaml)
![Go Report Card](https://goreportcard.com/badge/github.com/linode_obs/nagios_exporter)
[![contributions](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat")](https://github.com/linode_obs/nagios_exporter/issues)

A Prometheus exporter currently supporting:

Expand Down Expand Up @@ -57,7 +57,7 @@ This exporter does not output Nagios check results as Prometheus metrics; it is
Substitute `{{ version }}` for your desired release.

```bash
wget https://github.com/wbollock/nagios_exporter/releases/download/v{{ version }}/prometheus-nagios-exporter_{{ version }}_linux_amd64.{deb,rpm}
wget https://github.com/linode_obs/nagios_exporter/releases/download/v{{ version }}/prometheus-nagios-exporter_{{ version }}_linux_amd64.{deb,rpm}
{dpkg,rpm} -i prometheus-nagios-exporter_{{ version }}_linux_amd64.{deb,rpm}
```

Expand All @@ -68,22 +68,22 @@ Populate `config.toml` with your `APIKey = NagiosXIAPIKey`
```console
sudo docker run \
-v ./config.toml:/etc/prometheus-nagios-exporter/config.toml \
ghcr.io/wbollock/nagios_exporter \
ghcr.io/linode_obs/nagios_exporter \
--nagios.scrape-uri http://localhost
```

### Binary

```bash
wget https://github.com/wbollock/nagios_exporter/releases/download/v{{ version }}/nagios_exporter_{{ version }}_Linux_x86_64.tar.gz
wget https://github.com/linode_obs/nagios_exporter/releases/download/v{{ version }}/nagios_exporter_{{ version }}_Linux_x86_64.tar.gz
tar xvf nagios_exporter_{{ version }}_Linux_x86_64.tar.gz
./nagios_exporter/prometheus-nagios-exporter
```

### Source

```bash
wget https://github.com/wbollock/nagios_exporter/archive/refs/tags/v{{ version }}.tar.gz
wget https://github.com/linode_obs/nagios_exporter/archive/refs/tags/v{{ version }}.tar.gz
tar xvf nagios_exporter-{{ version }}.tar.gz
cd ./nagios_exporter-{{ version }}
go build nagios_exporter.go
Expand Down Expand Up @@ -271,7 +271,7 @@ goreleaser release
<table>
<tbody>
<tr>
<td align="center"><a href="https://github.com/tjhop"><img src="https://avatars.githubusercontent.com/u/33664289?v=4?s=100" width="100px;" alt="TJ Hoplock"/><br /><sub><b>TJ Hoplock</b></sub></a><br /><a href="https://github.com/wbollock/nagios_exporter/commits?author=tjhop" title="Code">💻</a> <a href="#mentoring-tjhop" title="Mentoring">🧑‍🏫</a></td>
<td align="center"><a href="https://github.com/tjhop"><img src="https://avatars.githubusercontent.com/u/33664289?v=4?s=100" width="100px;" alt="TJ Hoplock"/><br /><sub><b>TJ Hoplock</b></sub></a><br /><a href="https://github.com/linode_obs/nagios_exporter/commits?author=tjhop" title="Code">💻</a> <a href="#mentoring-tjhop" title="Mentoring">🧑‍🏫</a></td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/wbollock/nagios_exporter
module github.com/linode_obs/nagios_exporter

go 1.19

Expand Down
2 changes: 1 addition & 1 deletion nagios_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"strings"
"time"

"github.com/wbollock/nagios_exporter/get_nagios_version"
"github.com/linode_obs/nagios_exporter/get_nagios_version"

"github.com/BurntSushi/toml"
"github.com/hashicorp/go-version"
Expand Down
2 changes: 1 addition & 1 deletion nfpm/systemd/prometheus-nagios-exporter.service
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Unit]
Description=Nagios Exporter
Documentation=https://github.com/wbollock/nagios_exporter
Documentation=https://github.com/linode_obs/nagios_exporter
Wants=network-online.target nagios.service
After=network-online.target nagios.service

Expand Down
2 changes: 1 addition & 1 deletion tests/get_nagios_version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

log "github.com/sirupsen/logrus"
"github.com/wbollock/nagios_exporter/get_nagios_version"
"github.com/linode_obs/nagios_exporter/get_nagios_version"
)

func TestGetStringFromWebpage(t *testing.T) {
Expand Down
Loading