Skip to content

Commit

Permalink
Merge pull request #188 from cloudfoundry/switch-paths-to-cloudfoundr…
Browse files Browse the repository at this point in the history
…y-org

Switch from bosh-prometheus to cloudfoundry
  • Loading branch information
gmllt authored Jun 27, 2024
2 parents 5cc3dbc + 939729c commit 4d83205
Show file tree
Hide file tree
Showing 23 changed files with 51 additions and 51 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ Here are some ways *you* can contribute:
* by writing specifications
* by writing code (**no patch is too small**: fix typos, add comments, clean up inconsistent whitespace)
* by refactoring code
* by closing [issues](https://github.com/bosh-prometheus/bosh_exporter/issues)
* by closing [issues](https://github.com/cloudfoundry/bosh_exporter/issues)
* by reviewing patches

## Submitting an Issue

We use the [GitHub issue tracker](https://github.com/bosh-prometheus/bosh_exporter/issues) to track bugs and features. Before submitting a bug report or feature request, check to make sure it hasn't already been submitted. You can indicate support for an existing issue by voting it up. When submitting a bug report, please include a [Gist](http://gist.github.com/) that includes a stack trace and any details that may be necessary to reproduce the bug. Ideally, a bug report should include a pull request with failing specs.
We use the [GitHub issue tracker](https://github.com/cloudfoundry/bosh_exporter/issues) to track bugs and features. Before submitting a bug report or feature request, check to make sure it hasn't already been submitted. You can indicate support for an existing issue by voting it up. When submitting a bug report, please include a [Gist](http://gist.github.com/) that includes a stack trace and any details that may be necessary to reproduce the bug. Ideally, a bug report should include a pull request with failing specs.

## Submitting a Pull Request

Expand All @@ -28,4 +28,4 @@ We use the [GitHub issue tracker](https://github.com/bosh-prometheus/bosh_export

## Code of Conduct

Please note that this project is released with a [Contributor Code of Conduct](https://github.com/bosh-prometheus/bosh_exporter/blob/master/CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
Please note that this project is released with a [Contributor Code of Conduct](https://github.com/cloudfoundry/bosh_exporter/blob/master/CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
6 changes: 3 additions & 3 deletions FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,12 @@ We will be glad to address any questions not answered here. Please, just open a
[bosh_agent]: https://bosh.io/docs/bosh-components/#agent
[bosh_azs]: https://bosh.io/docs/azs/
[bosh_director]: https://bosh.io/docs/bosh-components/#director
[bosh_exporter_metrics]: https://github.com/bosh-prometheus/bosh_exporter#metrics
[bosh_exporter_metrics]: https://github.com/cloudfoundry/bosh_exporter#metrics
[bosh_graphite]: https://bosh.io/docs/hm-config/#graphite
[bosh_hmforwarder]: https://github.com/cloudfoundry-attic/bosh-hm-forwarder
[bosh_health_monitor]: https://bosh.io/docs/bosh-components/#health-monitor
[bosh_lite]: https://github.com/cloudfoundry/bosh-lite
[bosh_lite_ca_cert]: https://github.com/bosh-prometheus/bosh_exporter/blob/master/bosh-lite-ca.crt
[bosh_lite_ca_cert]: https://github.com/cloudfoundry/bosh_exporter/blob/master/bosh-lite-ca.crt
[director_certs]: https://bosh.io/docs/director-certs/
[director_task]: https://bosh.io/docs/director-tasks/
[file_sd_config]: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#file_sd_config
Expand All @@ -153,7 +153,7 @@ We will be glad to address any questions not answered here. Please, just open a
[graphite_exporter]: https://github.com/prometheus/graphite_exporter
[graphite_mapping]: https://github.com/prometheus/graphite_exporter#metric-mapping-and-configuration
[instance_details]: https://bosh.io/docs/director-api-v1/#list-instances-detailed
[issues]: https://github.com/bosh-prometheus/bosh_exporter/issues
[issues]: https://github.com/cloudfoundry/bosh_exporter/issues
[node_exporter]: https://github.com/prometheus/node_exporter
[prometheus_github]: https://github.com/prometheus/prometheus
[relabel_config]: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# BOSH Prometheus Exporter [![Build Status](https://travis-ci.org/bosh-prometheus/bosh_exporter.png)](https://travis-ci.org/bosh-prometheus/bosh_exporter)
# BOSH Prometheus Exporter [![Build Status](https://travis-ci.org/cloudfoundry/bosh_exporter.png)](https://travis-ci.org/cloudfoundry/bosh_exporter)

A [Prometheus][prometheus] exporter for [BOSH][bosh] metrics. Please refer to the [FAQ][faq] for general questions about
this exporter.

## Architecture overview

![](https://cdn.rawgit.com/bosh-prometheus/bosh_exporter/master/architecture/architecture.svg)
![](https://cdn.rawgit.com/cloudfoundry/bosh_exporter/master/architecture/architecture.svg)

## Installation

Expand All @@ -22,7 +22,7 @@ $ ./bosh_exporter <flags>
Using the standard `go install` (you must have [Go][golang] already installed in your local machine):

```bash
$ go install github.com/bosh-prometheus/bosh_exporter
$ go install github.com/cloudfoundry/bosh_exporter
$ bosh_exporter <flags>
```

Expand All @@ -39,7 +39,7 @@ $ docker run -p 9190:9190 boshprometheus/bosh-exporter <flags>
The exporter can be deployed to an already existing [Cloud Foundry][cloudfoundry] environment:

```bash
$ git clone https://github.com/bosh-prometheus/bosh_exporter.git
$ git clone https://github.com/cloudfoundry/bosh_exporter.git
$ cd bosh_exporter
```

Expand Down Expand Up @@ -224,25 +224,25 @@ Refer to the [contributing guidelines][contributing].

Apache License 2.0, see [LICENSE][license].

[binaries]: https://github.com/bosh-prometheus/bosh_exporter/releases
[binaries]: https://github.com/cloudfoundry/bosh_exporter/releases

[bosh]: https://bosh.io

[bosh_uaa]: https://bosh.io/docs/director-users-uaa/

[cloudfoundry]: https://www.cloudfoundry.org/

[contributing]: https://github.com/bosh-prometheus/bosh_exporter/blob/master/CONTRIBUTING.md
[contributing]: https://github.com/cloudfoundry/bosh_exporter/blob/master/CONTRIBUTING.md

[faq]: https://github.com/bosh-prometheus/bosh_exporter/blob/master/FAQ.md
[faq]: https://github.com/cloudfoundry/bosh_exporter/blob/master/FAQ.md

[file_sd_config]: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#file_sd_config

[golang]: https://go.dev/

[license]: https://github.com/bosh-prometheus/bosh_exporter/blob/master/LICENSE
[license]: https://github.com/cloudfoundry/bosh_exporter/blob/master/LICENSE

[manifest]: https://github.com/bosh-prometheus/bosh_exporter/blob/master/manifest.yml
[manifest]: https://github.com/cloudfoundry/bosh_exporter/blob/master/manifest.yml

[prometheus]: https://prometheus.io/

Expand Down
6 changes: 3 additions & 3 deletions bosh_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"github.com/prometheus/common/version"
kingpin "gopkg.in/alecthomas/kingpin.v2"

"github.com/bosh-prometheus/bosh_exporter/collectors"
"github.com/bosh-prometheus/bosh_exporter/deployments"
"github.com/bosh-prometheus/bosh_exporter/filters"
"github.com/cloudfoundry/bosh_exporter/collectors"
"github.com/cloudfoundry/bosh_exporter/deployments"
"github.com/cloudfoundry/bosh_exporter/filters"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions collectors/bosh_collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"

"github.com/bosh-prometheus/bosh_exporter/deployments"
"github.com/bosh-prometheus/bosh_exporter/filters"
"github.com/cloudfoundry/bosh_exporter/deployments"
"github.com/cloudfoundry/bosh_exporter/filters"
)

type BoshCollector struct {
Expand Down
8 changes: 4 additions & 4 deletions collectors/bosh_collector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"

"github.com/bosh-prometheus/bosh_exporter/deployments"
"github.com/bosh-prometheus/bosh_exporter/filters"
"github.com/cloudfoundry/bosh_exporter/deployments"
"github.com/cloudfoundry/bosh_exporter/filters"

"github.com/bosh-prometheus/bosh_exporter/collectors"
"github.com/bosh-prometheus/bosh_exporter/utils/matchers"
"github.com/cloudfoundry/bosh_exporter/collectors"
"github.com/cloudfoundry/bosh_exporter/utils/matchers"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion collectors/collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package collectors
import (
"github.com/prometheus/client_golang/prometheus"

"github.com/bosh-prometheus/bosh_exporter/deployments"
"github.com/cloudfoundry/bosh_exporter/deployments"
)

type Collector interface {
Expand Down
2 changes: 1 addition & 1 deletion collectors/deployments_collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/prometheus/client_golang/prometheus"

"github.com/bosh-prometheus/bosh_exporter/deployments"
"github.com/cloudfoundry/bosh_exporter/deployments"
)

type DeploymentsCollector struct {
Expand Down
6 changes: 3 additions & 3 deletions collectors/deployments_collector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"

"github.com/bosh-prometheus/bosh_exporter/deployments"
"github.com/cloudfoundry/bosh_exporter/deployments"

"github.com/bosh-prometheus/bosh_exporter/collectors"
"github.com/bosh-prometheus/bosh_exporter/utils/matchers"
"github.com/cloudfoundry/bosh_exporter/collectors"
"github.com/cloudfoundry/bosh_exporter/utils/matchers"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions collectors/jobs_collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"github.com/prometheus/client_golang/prometheus"

"github.com/bosh-prometheus/bosh_exporter/deployments"
"github.com/bosh-prometheus/bosh_exporter/filters"
"github.com/cloudfoundry/bosh_exporter/deployments"
"github.com/cloudfoundry/bosh_exporter/filters"
)

type JobsCollector struct {
Expand Down
8 changes: 4 additions & 4 deletions collectors/jobs_collector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"

"github.com/bosh-prometheus/bosh_exporter/deployments"
"github.com/bosh-prometheus/bosh_exporter/filters"
"github.com/cloudfoundry/bosh_exporter/deployments"
"github.com/cloudfoundry/bosh_exporter/filters"

"github.com/bosh-prometheus/bosh_exporter/collectors"
"github.com/bosh-prometheus/bosh_exporter/utils/matchers"
"github.com/cloudfoundry/bosh_exporter/collectors"
"github.com/cloudfoundry/bosh_exporter/utils/matchers"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions collectors/service_discovery_collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/model"

"github.com/bosh-prometheus/bosh_exporter/deployments"
"github.com/bosh-prometheus/bosh_exporter/filters"
"github.com/cloudfoundry/bosh_exporter/deployments"
"github.com/cloudfoundry/bosh_exporter/filters"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions collectors/service_discovery_collector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"

"github.com/bosh-prometheus/bosh_exporter/deployments"
"github.com/bosh-prometheus/bosh_exporter/filters"
"github.com/cloudfoundry/bosh_exporter/deployments"
"github.com/cloudfoundry/bosh_exporter/filters"

"github.com/bosh-prometheus/bosh_exporter/collectors"
"github.com/cloudfoundry/bosh_exporter/collectors"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion deployments/deployments_fetcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/cloudfoundry/bosh-cli/director"
"github.com/prometheus/common/log"

"github.com/bosh-prometheus/bosh_exporter/filters"
"github.com/cloudfoundry/bosh_exporter/filters"
)

type Fetcher struct {
Expand Down
4 changes: 2 additions & 2 deletions deployments/deployments_fetcher_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/cppforlife/go-semi-semantic/version"
"github.com/prometheus/common/log"

"github.com/bosh-prometheus/bosh_exporter/filters"
"github.com/cloudfoundry/bosh_exporter/filters"

"github.com/bosh-prometheus/bosh_exporter/deployments"
"github.com/cloudfoundry/bosh_exporter/deployments"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion filters/azs_filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"

"github.com/bosh-prometheus/bosh_exporter/filters"
"github.com/cloudfoundry/bosh_exporter/filters"
)

var _ = ginkgo.Describe("AZsFilter", func() {
Expand Down
2 changes: 1 addition & 1 deletion filters/cidr_filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"

"github.com/bosh-prometheus/bosh_exporter/filters"
"github.com/cloudfoundry/bosh_exporter/filters"
)

var _ = ginkgo.Describe("Cidr Filter", func() {
Expand Down
2 changes: 1 addition & 1 deletion filters/collectors_filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"

"github.com/bosh-prometheus/bosh_exporter/filters"
"github.com/cloudfoundry/bosh_exporter/filters"
)

var _ = ginkgo.Describe("CollectorsFilter", func() {
Expand Down
2 changes: 1 addition & 1 deletion filters/deployments_filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/cloudfoundry/bosh-cli/director/directorfakes"
"github.com/prometheus/common/log"

"github.com/bosh-prometheus/bosh_exporter/filters"
"github.com/cloudfoundry/bosh_exporter/filters"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion filters/regexp_filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"

"github.com/bosh-prometheus/bosh_exporter/filters"
"github.com/cloudfoundry/bosh_exporter/filters"
)

var _ = ginkgo.Describe("RegexpFilter", func() {
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/bosh-prometheus/bosh_exporter
module github.com/cloudfoundry/bosh_exporter

go 1.22.4

Expand Down
2 changes: 1 addition & 1 deletion manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ applications:
- name: bosh-exporter
buildpack: go_buildpack
env:
GOPACKAGENAME: github.com/bosh-prometheus/bosh_exporter
GOPACKAGENAME: github.com/cloudfoundry/bosh_exporter
BOSH_EXPORTER_BOSH_URL: "Your BOSH URL"
BOSH_EXPORTER_BOSH_USERNAME: "Your BOSH Username"
BOSH_EXPORTER_BOSH_PASSWORD: "Your BOSH Password"
Expand Down
2 changes: 1 addition & 1 deletion utils/matchers/prometheus_metric_matcher_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/prometheus/client_golang/prometheus"

"github.com/bosh-prometheus/bosh_exporter/utils/matchers"
"github.com/cloudfoundry/bosh_exporter/utils/matchers"
)

var _ = ginkgo.Describe("matchers.PrometheusMetric", func() {
Expand Down

0 comments on commit 4d83205

Please sign in to comment.