Skip to content

Commit

Permalink
Merge pull request #130 from cloudfoundry/replace-bosh-prometheus-wit…
Browse files Browse the repository at this point in the history
…h-cloudfoundry

Adjust import statements to use cloudfoundry
  • Loading branch information
gmllt authored Jun 19, 2024
2 parents 686e22b + 91a09a7 commit c299790
Show file tree
Hide file tree
Showing 30 changed files with 47 additions and 47 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/cf_exporter/issues)
* by closing [issues](https://github.com/cloudfoundry/cf_exporter/issues)
* by reviewing patches

## Submitting an Issue

We use the [GitHub issue tracker](https://github.com/bosh-prometheus/cf_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/cf_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/cf_exporter

## Code of Conduct

Please note that this project is released with a [Contributor Code of Conduct](https://github.com/bosh-prometheus/cf_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/cf_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 @@ -67,8 +67,8 @@ No, this exporter only supports targetting a single [Cloud Foundry API][cf_api]
We will be glad to address any questions not answered here. Please, just open a [new issue][issues].

[cf_api]: https://apidocs.cloudfoundry.org/
[cf_exporter_metrics]: https://github.com/bosh-prometheus/cf_exporter#metrics
[cf_exporter_metrics]: https://github.com/cloudfoundry/cf_exporter#metrics
[firehose]: https://docs.cloudfoundry.org/loggregator/architecture.html#firehose
[firehose_exporter]: https://github.com/bosh-prometheus/firehose_exporter
[issues]: https://github.com/bosh-prometheus/cf_exporter/issues
[firehose_exporter]: https://github.com/cloudfoundry/firehose_exporter
[issues]: https://github.com/cloudfoundry/cf_exporter/issues
[read-only-cc]: https://www.starkandwayne.com/blog/cloud-controller-reporting-api-server/
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Cloud Foundry Prometheus Exporter ![Build Status](https://github.com/bosh-prometheus/cf_exporter/workflows/main.yml/badge.svg)
# Cloud Foundry Prometheus Exporter ![Build Status](https://github.com/cloudfoundry/cf_exporter/workflows/main.yml/badge.svg)

A [Prometheus][prometheus] exporter for [Cloud Foundry][cloudfoundry] administrative information.
Please refer to the [FAQ][faq] for general questions about this exporter.

## Architecture overview

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

## Installation

Expand All @@ -22,7 +22,7 @@ $ ./cf_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/cf_exporter
$ go install github.com/cloudfoundry/cf_exporter
$ cf_exporter <flags>
```

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

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

Expand Down Expand Up @@ -326,7 +326,7 @@ Refer to the [contributing guidelines][contributing].

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

[binaries]: https://github.com/bosh-prometheus/cf_exporter/releases
[binaries]: https://github.com/cloudfoundry/cf_exporter/releases
[cf_api]: https://apidocs.cloudfoundry.org/
[cf_api_v3]: https://v3-apidocs.cloudfoundry.org/
[cloudfoundry]: https://www.cloudfoundry.org/
Expand All @@ -336,4 +336,4 @@ Apache License 2.0, see [LICENSE][license].
[license]: ./LICENSE
[manifest]: ./packages/cf/manifest.yml
[prometheus]: https://prometheus.io/
[prometheus-boshrelease]: https://github.com/bosh-prometheus/prometheus-boshrelease
[prometheus-boshrelease]: https://github.com/cloudfoundry/prometheus-boshrelease
2 changes: 1 addition & 1 deletion collectors/applications.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant"
"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion collectors/buildpacks.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package collectors
import (
"time"

"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
6 changes: 3 additions & 3 deletions collectors/collectors.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package collectors

import (
"github.com/bosh-prometheus/cf_exporter/fetcher"
"github.com/bosh-prometheus/cf_exporter/filters"
"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/fetcher"
"github.com/cloudfoundry/cf_exporter/filters"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
2 changes: 1 addition & 1 deletion collectors/domains.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package collectors
import (
"time"

"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
2 changes: 1 addition & 1 deletion collectors/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package collectors
import (
"time"

"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
2 changes: 1 addition & 1 deletion collectors/isolation_segments.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package collectors
import (
"time"

"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
)

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

"code.cloudfoundry.org/cli/resources"
"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion collectors/route_bindings.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package collectors
import (
"time"

"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
2 changes: 1 addition & 1 deletion collectors/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package collectors
import (
"time"

"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
2 changes: 1 addition & 1 deletion collectors/security_groups.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package collectors
import (
"time"

"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
2 changes: 1 addition & 1 deletion collectors/service_bindings.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package collectors
import (
"time"

"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
2 changes: 1 addition & 1 deletion collectors/service_instances.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"time"

"code.cloudfoundry.org/cli/resources"
"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
2 changes: 1 addition & 1 deletion collectors/service_plans.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package collectors
import (
"time"

"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
2 changes: 1 addition & 1 deletion collectors/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package collectors
import (
"time"

"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
)

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

"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant"
"code.cloudfoundry.org/cli/resources"
"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion collectors/stacks.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package collectors
import (
"time"

"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
2 changes: 1 addition & 1 deletion collectors/tasks.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package collectors
import (
"time"

"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
4 changes: 2 additions & 2 deletions fetcher/fetcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"time"

"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
"github.com/bosh-prometheus/cf_exporter/filters"
"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/filters"
"github.com/cloudfoundry/cf_exporter/models"
log "github.com/sirupsen/logrus"
)

Expand Down
6 changes: 3 additions & 3 deletions fetcher/fetcher_handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
"code.cloudfoundry.org/cli/resources"
"github.com/bosh-prometheus/cf_exporter/filters"
"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/filters"
"github.com/cloudfoundry/cf_exporter/models"
log "github.com/sirupsen/logrus"
)

Expand Down Expand Up @@ -41,7 +41,7 @@ func (c *Fetcher) fetchOrgQuotas(session *SessionExt, entry *models.CFObjects) e

// fetchSpaces
// 1. silent fail because space may have been deleted between listing and
// summary fetching attempt. See bosh-prometheus/cf_exporter#85
// summary fetching attempt. See cloudfoundry/cf_exporter#85
func (c *Fetcher) fetchSpaces(session *SessionExt, entry *models.CFObjects) error {
spaces, _, _, err := session.V3().GetSpaces(LargeQuery)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion fetcher/fetcher_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"

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

var _ = ginkgo.Describe("Fetcher", func() {
Expand Down
2 changes: 1 addition & 1 deletion fetcher/sessionext.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net/http"

"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
"github.com/bosh-prometheus/cf_exporter/models"
clients "github.com/cloudfoundry-community/go-cf-clients-helper/v2"
"github.com/cloudfoundry/cf_exporter/models"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion fetcher/sessionext_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"encoding/json"
"net/http"

"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/models"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions fetcher/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"sync"
"time"

"github.com/bosh-prometheus/cf_exporter/filters"
"github.com/bosh-prometheus/cf_exporter/models"
"github.com/cloudfoundry/cf_exporter/filters"
"github.com/cloudfoundry/cf_exporter/models"
log "github.com/sirupsen/logrus"
)

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

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

var _ = ginkgo.Describe("Filters", 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/cf_exporter
module github.com/cloudfoundry/cf_exporter

go 1.21

Expand Down
6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strings"
"time"

"github.com/bosh-prometheus/cf_exporter/collectors"
"github.com/bosh-prometheus/cf_exporter/fetcher"
"github.com/bosh-prometheus/cf_exporter/filters"
"github.com/cloudfoundry/cf_exporter/collectors"
"github.com/cloudfoundry/cf_exporter/fetcher"
"github.com/cloudfoundry/cf_exporter/filters"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/prometheus/common/version"
Expand Down
2 changes: 1 addition & 1 deletion packages/cf/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ applications:
- name: cf-exporter
buildpack: go_buildpack
env:
GOPACKAGENAME: github.com/bosh-prometheus/cf_exporter
GOPACKAGENAME: github.com/cloudfoundry/cf_exporter
CF_EXPORTER_CF_API_URL: "Your Cloud Foundry API URL"
CF_EXPORTER_CF_USERNAME: "Your Cloud Foundry Username"
CF_EXPORTER_CF_PASSWORD: "Your Cloud Foundry Password"
Expand Down

0 comments on commit c299790

Please sign in to comment.