Skip to content

Commit

Permalink
Merge pull request #3 from FundingCircle/bump-go-and-version
Browse files Browse the repository at this point in the history
Bump 0.11.0 version
  • Loading branch information
bliof-fc committed Dec 18, 2019
2 parents 61b0051 + 83898e2 commit 1895d70
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 70 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version: 2.1
jobs:
test:
docker:
- image: circleci/golang:1.12
- image: circleci/golang:1.13

working_directory: /go/src/github.com/{{ORG_NAME}}/{{REPO_NAME}}
working_directory: /go/src/github.com/FundingCircle/haproxy_exporter
steps:
- checkout
- run: make
Expand Down
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @FundingCircle/platform-engineering
6 changes: 3 additions & 3 deletions .promu.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
go:
# Whenever the Go version is updated here, .travis.yml and
# Whenever the Go version is updated here and
# .circle/config.yml should also be updated.
version: 1.12
version: 1.13
repository:
path: github.com/prometheus/haproxy_exporter
path: github.com/FundingCircle/haproxy_exporter
build:
flags: -mod=vendor -a -tags netgo
ldflags: |
Expand Down
9 changes: 0 additions & 9 deletions .travis.yml

This file was deleted.

18 changes: 0 additions & 18 deletions CONTRIBUTING.md

This file was deleted.

1 change: 0 additions & 1 deletion MAINTAINERS.md

This file was deleted.

38 changes: 7 additions & 31 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# HAProxy Exporter for Prometheus

Fork of https://github.com/prometheus/haproxy_exporter

This is a simple server that scrapes HAProxy stats and exports them via HTTP for
Prometheus consumption.

***Note:** since HAProxy 2.0.0, the official source includes a Prometheus exporter module that can be built into your binary with a single flag during build time and offers an exporter-free Prometheus endpoint. More information [down below](#official-prometheus-exporter).*
**\*Note:** since HAProxy 2.0.0, the official source includes a Prometheus exporter module that can be built into your binary with a single flag during build time and offers an exporter-free Prometheus endpoint. More information [down below](#official-prometheus-exporter).*

## Getting Started

Expand All @@ -19,11 +21,9 @@ Help on flags:
./haproxy_exporter --help
```

For more information check the [source code documentation][gdocs]. All of the
core developers are accessible via the Prometheus Developers [mailinglist][].
For more information check the [source code documentation][gdocs].

[gdocs]: http://godoc.org/github.com/prometheus/haproxy_exporter
[mailinglist]: https://groups.google.com/forum/?fromgroups#!forum/prometheus-developers
[gdocs]: https://godoc.org/github.com/FundingCircle/haproxy_exporter

## Usage

Expand Down Expand Up @@ -75,28 +75,6 @@ The scrape URL uses the 'unix:' scheme:
haproxy_exporter --haproxy.scrape-uri=unix:/run/haproxy/admin.sock
```

### Docker

[![Docker Repository on Quay](https://quay.io/repository/prometheus/haproxy-exporter/status)][quay]
[![Docker Pulls](https://img.shields.io/docker/pulls/prom/haproxy-exporter.svg?maxAge=604800)][hub]

To run the haproxy exporter as a Docker container, run:

```bash
docker run -p 9101:9101 quay.io/prometheus/haproxy-exporter:v0.9.0 --haproxy.scrape-uri="http://user:pass@haproxy.example.com/haproxy?stats;csv"
```

[hub]: https://hub.docker.com/r/prom/haproxy-exporter/
[quay]: https://quay.io/repository/prometheus/haproxy-exporter

## Development

[![Go Report Card](https://goreportcard.com/badge/github.com/prometheus/haproxy_exporter)][goreportcard]
[![Code Climate](https://codeclimate.com/github/prometheus/haproxy_exporter/badges/gpa.svg)][codeclimate]

[goreportcard]: https://goreportcard.com/report/github.com/prometheus/haproxy_exporter
[codeclimate]: https://codeclimate.com/github/prometheus/haproxy_exporter

### Building

```bash
Expand All @@ -105,15 +83,13 @@ make build

### Testing

[![Build Status](https://travis-ci.org/prometheus/haproxy_exporter.png?branch=master)][travisci]
[![CircleCI](https://circleci.com/gh/prometheus/haproxy_exporter/tree/master.svg?style=shield)][circleci]
[![CircleCI](https://circleci.com/gh/FundingCircle/haproxy_exporter/tree/master.svg?style=shield)][circleci]

```bash
make test
```

[travisci]: https://travis-ci.org/prometheus/haproxy_exporter
[circleci]: https://circleci.com/gh/prometheus/haproxy_exporter
[circleci]: https://circleci.com/gh/FundingCircle/haproxy_exporter

## License

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.0
0.11.0
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
module github.com/prometheus/haproxy_exporter
module github.com/FundingCircle/haproxy_exporter

require (
github.com/go-kit/kit v0.8.0
github.com/prometheus/client_golang v1.0.0
github.com/prometheus/common v0.4.1
gopkg.in/alecthomas/kingpin.v2 v2.2.6
)

go 1.13
8 changes: 4 additions & 4 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ github.com/matttproud/golang_protobuf_extensions/pbutil
github.com/pkg/errors
# github.com/prometheus/client_golang v1.0.0
github.com/prometheus/client_golang/prometheus
github.com/prometheus/client_golang/prometheus/promhttp
github.com/prometheus/client_golang/prometheus/internal
github.com/prometheus/client_golang/prometheus/promhttp
github.com/prometheus/client_golang/prometheus/testutil
# github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
github.com/prometheus/client_model/go
# github.com/prometheus/common v0.4.1
github.com/prometheus/common/expfmt
github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
github.com/prometheus/common/model
github.com/prometheus/common/promlog
github.com/prometheus/common/promlog/flag
github.com/prometheus/common/version
github.com/prometheus/common/expfmt
github.com/prometheus/common/model
github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
# github.com/prometheus/procfs v0.0.2
github.com/prometheus/procfs
github.com/prometheus/procfs/internal/fs
Expand Down

0 comments on commit 1895d70

Please sign in to comment.