Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rethinkdb/prometheus-exporter
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: isard-vdi/rethinkdb-prometheus-exporter
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 5 commits
  • 4 files changed
  • 3 contributors

Commits on Nov 27, 2023

  1. chore: remove deprecated io/ioutil package

    @NefixEstrada
    NefixEstrada committed Nov 27, 2023
    Copy the full SHA
    9a5f3ba View commit details

  2. chore: update dependencies and minimum Go version

    @NefixEstrada
    NefixEstrada committed Nov 27, 2023
    Copy the full SHA
    a9dff97 View commit details

Commits on Jun 3, 2024

  1. chore: update dependencies and minimum Go version

    @NefixEstrada
    NefixEstrada committed Jun 3, 2024
    Copy the full SHA
    ab0d69e View commit details

Commits on Feb 5, 2025

  1. chore: update dependencies and minimum Go version

    @mgamboav
    mgamboav committed Feb 5, 2025
    Copy the full SHA
    1198737 View commit details

Commits on Feb 12, 2025

  1. Merge pull request #1 from mgamboav/master 

    chore: update dependencies and minimum Go version
    @jvinolas
    jvinolas authored Feb 12, 2025
    Copy the full SHA
    b617a41 View commit details
Showing with 191 additions and 205 deletions.
  1. +1 −1 Dockerfile
  2. +2 −2 dbconnector/tls.go
  3. +48 −11 go.mod
  4. +140 −191 go.sum
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14.0 as build
FROM golang:1.22 as build

COPY . /src
RUN set -ex \
4 changes: 2 additions & 2 deletions dbconnector/tls.go
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import (
"crypto/x509"
"errors"
"fmt"
"io/ioutil"
"os"
)

// PrepareTLSConfig creates tls.Config with certificate files
@@ -26,7 +26,7 @@ func PrepareTLSConfig(caFile, certFile, keyFile string) (*tls.Config, error) {
}

if len(caFile) != 0 {
ca, err := ioutil.ReadFile(caFile)
ca, err := os.ReadFile(caFile)
if err != nil {
return nil, fmt.Errorf("TLS CA file load error: %v", err)
}
59 changes: 48 additions & 11 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,53 @@
module github.com/rethinkdb/prometheus-exporter

go 1.13
go 1.22.0

toolchain go1.22.11

require (
github.com/prometheus/client_golang v1.20.5
github.com/prometheus/common v0.62.0
github.com/rs/zerolog v1.33.0
github.com/spf13/cobra v1.8.1
github.com/spf13/viper v1.19.0
golang.org/x/sync v0.11.0
gopkg.in/rethinkdb/rethinkdb-go.v6 v6.2.2
)

require (
github.com/bitly/go-hostpool v0.1.0 // indirect
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/prometheus/client_golang v0.9.3
github.com/prometheus/common v0.4.0
github.com/rs/zerolog v1.18.0
github.com/spf13/cobra v0.0.6
github.com/spf13/viper v1.6.2
golang.org/x/sync v0.0.0-20190423024810-112230192c58
golang.org/x/tools v0.0.0-20200221224223-e1da425f72fd // indirect
gopkg.in/rethinkdb/rethinkdb-go.v6 v6.0.0
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/magiconair/properties v1.8.9 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/sagikazarmark/locafero v0.7.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.12.0 // indirect
github.com/spf13/cast v1.7.1 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/text v0.22.0 // indirect
google.golang.org/protobuf v1.36.4 // indirect
gopkg.in/cenkalti/backoff.v2 v2.2.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading