Unverified Commit 951ef7ed authored by Michael Daniels's avatar Michael Daniels Committed by GitHub
Browse files

prometheus-tailscale-exporter: 0.2.5 -> 0.3.0 (#474348)

parents bbd6414d a6ad5838

nixos/tests/prometheus-exporters.nix

+14 −15
Original line number Diff line number Diff line
@@ -1901,24 +1901,23 @@ let 
              # testing the NixOS module.

              (pkgs.writeText "allow-running-without-credentials" ''

                diff --git a/cmd/tailscale-exporter/root.go b/cmd/tailscale-exporter/root.go

                index 2ff11cb..2fb576f 100644

                index 14089f9..2bb9a25 100644

                --- a/cmd/tailscale-exporter/root.go

                +++ b/cmd/tailscale-exporter/root.go

                @@ -137,14 +137,6 @@ func runExporter(cmd *cobra.Command, args []string) error {

                ''\t// Create HTTP client that automatically handles token refresh

                ''\thttpClient := oauthConfig.Client(context.Background())



                -''\t// Test OAuth token generation

                -''\ttoken, err := oauthConfig.Token(context.Background())

                -''\tif err != nil {

                -''\t''\treturn fmt.Errorf("failed to obtain OAuth token: %w", err)

                -''\t}

                -''\tlogger.Info("OAuth token obtained", "token_type", token.TokenType)

                -''\tlogger.Info("Successfully obtained OAuth token", "expires", token.Expiry)

                @@ -162,13 +162,6 @@ func runExporter(cmd *cobra.Command, args []string) error {

                ''\t''\t}



                ''\t''\thttpClient := oauthConfig.Client(context.Background())

                -''\t''\ttoken, err := oauthConfig.Token(context.Background())

                -''\t''\tif err != nil {

                -''\t''\t''\treturn fmt.Errorf("failed to obtain OAuth token: %w", err)

                -''\t''\t}

                -''\t''\tlogger.Info("OAuth token obtained", "token_type", token.TokenType)

                -''\t''\tlogger.Info("Successfully obtained OAuth token", "expires", token.Expiry)

                -

                ''\t// Default labels for all metrics

                ''\tdefaultLabels := prometheus.Labels{"tailnet": tailnet}

                ''\treg := prometheus.WrapRegistererWith(

                ''\t''\ttsCollector, err := tailscale.NewTailscaleCollector(

                ''\t''\t''\tlogger,

                ''\t''\t''\thttpClient,

              '')

            ];

          };

pkgs/by-name/pr/prometheus-tailscale-exporter/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -8,16 +8,16 @@ 


buildGoModule (finalAttrs: {

  pname = "tailscale-exporter";

  version = "0.2.5";

  version = "0.3.0";



  src = fetchFromGitHub {

    owner = "adinhodovic";

    repo = "tailscale-exporter";

    tag = finalAttrs.version;

    hash = "sha256-6iQtGfQsXVmwFaSA7B1AG+kbtSyKVWFbEld1lMb0DnE=";

    hash = "sha256-zZxKTEm23iXv4qYwx6gBtBuz5pduuIXLwMX0ZrrYxZs=";

  };



  vendorHash = "sha256-Nbx6LyGGhdgI4oEtbyqhJ2H1lY6BfSL/ROH/Dh4UOk0=";

  vendorHash = "sha256-WHtmis8r62th90BrM+f63yuyRkW4bVT/vPDfcIJ3Fg8=";



  subPackages = [

    "cmd/tailscale-exporter"