Skip to content
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 .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ executors:
# This must match .promu.yml.
golang:
docker:
- image: circleci/golang:1.14
- image: circleci/golang:1.15

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion .promu.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
go:
# This must match .circle/config.yml.
version: 1.14
version: 1.15
repository:
path: github.com/prometheus-community/json_exporter
build:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.2.0 / unreleased

* [CHANGE] This release is complete refactoring #49
* [BUGFIX] Fix unchecked call to io.Copy #57

## 0.1.0 / 2020-07-27

Initial prometheus-community release.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.0
0.2.0
2 changes: 1 addition & 1 deletion exporter/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func CreateMetricsList(c config.Config) ([]JsonMetric, error) {

func FetchJson(ctx context.Context, logger log.Logger, endpoint string, config config.Config) ([]byte, error) {
httpClientConfig := config.HTTPClientConfig
client, err := pconfig.NewClientFromConfig(httpClientConfig, "fetch_json", true)
client, err := pconfig.NewClientFromConfig(httpClientConfig, "fetch_json", true, false)
if err != nil {
level.Error(logger).Log("msg", "Error generating HTTP client", "err", err) //nolint:errcheck
return nil, err
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ module github.com/prometheus-community/json_exporter
go 1.14

require (
github.com/go-kit/kit v0.9.0
github.com/go-kit/kit v0.10.0
github.com/kawamuray/jsonpath v0.0.0-20160208140654-5c448ebf9735
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/common v0.10.0
github.com/prometheus/client_golang v1.8.0
github.com/prometheus/common v0.14.0
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/yaml.v2 v2.3.0
)
308 changes: 308 additions & 0 deletions go.sum

Large diffs are not rendered by default.