Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 0.4.0 compilation problem #277

Merged
merged 3 commits into from
Feb 6, 2023
Merged

Conversation

pelov
Copy link
Contributor

@pelov pelov commented Feb 1, 2023

Description

This is a quick fix for #275 mostly by looking at how other projects use the prometheus/exporter-toolkit to parse the kingping flags.

Type of change

  • Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

Tested that the --web.listen-address flag is working but haven't tested the --web.config.

@vutkin
Copy link
Contributor

vutkin commented Feb 1, 2023

Hi @pelov, thanks for contribution, but you need adjust README.md as well in this PR.

@pelov
Copy link
Contributor Author

pelov commented Feb 1, 2023

Hi @pelov, thanks for contribution, but you need adjust README.md as well in this PR.

What needs to be fixed in the README.md file? Nothing has changed in the command line options.

@vutkin
Copy link
Contributor

vutkin commented Feb 1, 2023

What I see:

  • now LISTEN_ADDRESS could not be configured via env var;
  • --web.config don't needed anymore (here I am not sure)?

@pelov
Copy link
Contributor Author

pelov commented Feb 1, 2023

The options that you see deleted in the diff (--web.listen-address and --web.config) are now added by the call to webflag.AddFlags. See https://github.com/prometheus/exporter-toolkit/blob/master/web/kingpinflag/flag.go.

I looked more carefully and noticed that --web.config is now renamed to --web.config.file. In addition, there is a new option --web.systemd-socket.

I updated the README.md file to reflect these changes.

I also tested the --web.config.file option and it seems to be working, i.e. starts listening on https instead of http.

@vutkin
Copy link
Contributor

vutkin commented Feb 1, 2023

Could you please update release version as well?
https://github.com/iamseth/oracledb_exporter/blob/master/Makefile#L6
Please set it to 0.4.1

@vutkin
Copy link
Contributor

vutkin commented Feb 1, 2023

Thanks, let's wait for github-action run.

@Yannig
Copy link
Collaborator

Yannig commented Feb 2, 2023

Hi people !

That look awesome and thanks for the contribution.

@vutkin
Copy link
Contributor

vutkin commented Feb 3, 2023

@vutkin
Copy link
Contributor

vutkin commented Feb 3, 2023

Hi @pelov, could you please do a rebase of fork repo from master and do a rebase from master for this PR (something like git rebase origin/master)?
It should be checked with pipeline but current version uses old broken one.

TIA.

@vutkin
Copy link
Contributor

vutkin commented Feb 3, 2023

Good evening @Yannig , could you please approve a pipeline run https://github.com/iamseth/oracledb_exporter/actions/runs/4087340850?

@vutkin
Copy link
Contributor

vutkin commented Feb 5, 2023

Hi @pelov, could you please do a rebase again? Sorry for this. But pipeline was broken.

@vutkin
Copy link
Contributor

vutkin commented Feb 6, 2023

Hey @Yannig , could you please approve a github run https://github.com/iamseth/oracledb_exporter/actions/runs/4098822304?

@Yannig Yannig merged commit 44ce18c into iamseth:master Feb 6, 2023
schmikei added a commit to observIQ/oracledb_exporter that referenced this pull request Apr 14, 2023
* remove metric scrape interval as it should be up to the invoker how to run

* feat: add gh workflows (iamseth#265)

* Bump github.com/BurntSushi/toml from 1.2.0 to 1.2.1 (iamseth#271)

Bumps [github.com/BurntSushi/toml](https://github.com/BurntSushi/toml) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/BurntSushi/toml/releases)
- [Commits](BurntSushi/toml@v1.2.0...v1.2.1)

---
updated-dependencies:
- dependency-name: github.com/BurntSushi/toml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump github.com/prometheus/exporter-toolkit from 0.7.3 to 0.8.2 (iamseth#272)

Bumps [github.com/prometheus/exporter-toolkit](https://github.com/prometheus/exporter-toolkit) from 0.7.3 to 0.8.2.
- [Release notes](https://github.com/prometheus/exporter-toolkit/releases)
- [Changelog](https://github.com/prometheus/exporter-toolkit/blob/master/CHANGELOG.md)
- [Commits](prometheus/exporter-toolkit@v0.7.3...v0.8.2)

---
updated-dependencies:
- dependency-name: github.com/prometheus/exporter-toolkit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump github.com/prometheus/client_golang from 1.13.0 to 1.14.0 (iamseth#274)

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.13.0...v1.14.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump github.com/prometheus/common from 0.37.0 to 0.39.0 (iamseth#273)

Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.37.0 to 0.39.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.37.0...v0.39.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Fixed github action runs against forked repos (iamseth#280)

* chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

fix: fix typo

fix: fix typo

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

fix: fix typo

* chore: savepoint

chore: savepoint

feat: test gh action pr-cleanup (#2)

* feat: test gh action pr-cleanup

* chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

* chore: savepoint

* chore: savepoint

* chore: savepoint

* chore: savepoint

* chore: savepoint

* chore: savepoint

* chore: savepoint

* feat: do a release 0.4.1 (#3)

* chore: savepoint

* chore: savepoint

* chore: savepoint

* feat: do a release 0.4.2 (iamseth#4)

* chore: savepoint

* chore: savepoint (iamseth#5)

* chore: savepoint

* chore: savepoint

* chore: savepoint

* feat: do release 0.4.4 (iamseth#6)

* feat: do a release 0.4.4

* chore: savepoint

* chore: savepoint

* chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

chore: savepoint

* fix: fix GitHub release failed with status: 403 (iamseth#282)

* Fix 0.4.0 compilation problem (iamseth#277)

* Fix parsing kingpin flags according to exporter-toolkit v0.8.2

Fixes iamseth#275

Signed-off-by: Nikolay Pelov <npelov@gmail.com>

* Update README file to reflect the changed options from exporter-toolkit.

* Update release version to 0.4.1

---------

Signed-off-by: Nikolay Pelov <npelov@gmail.com>

* Improve logging after the switch to github.com/go-kit/kit/log (iamseth#278)

Signed-off-by: Nikolay Pelov <npelov@gmail.com>

* refact: refact PR/release github-actions  (iamseth#286)

* refact: refact PR github action a bit

* chore: savepoint

* chore: savepoint

* Caiwc/multi target (iamseth#234)

* feat(): support scrape multi target

rebase branch && update Makefile version

* add multi-target explain to readme

* docs: correct dns example port of readme

---------

Co-authored-by: wccai <wccai@easyops.cn>
Co-authored-by: wccai <wccai@easyops>

* README: add example of image hosted on github image registry

* Bump golang.org/x/net from 0.4.0 to 0.7.0 (iamseth#290)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.4.0 to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](golang/net@v0.4.0...v0.7.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump github.com/prometheus/common from 0.39.0 to 0.40.0 (iamseth#291)

Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.39.0 to 0.40.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.39.0...v0.40.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump github.com/prometheus/common from 0.40.0 to 0.41.0 (iamseth#292)

Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.40.0 to 0.41.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.40.0...v0.41.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump github.com/prometheus/exporter-toolkit from 0.8.2 to 0.9.0 (iamseth#294)

Bumps [github.com/prometheus/exporter-toolkit](https://github.com/prometheus/exporter-toolkit) from 0.8.2 to 0.9.0.
- [Release notes](https://github.com/prometheus/exporter-toolkit/releases)
- [Changelog](https://github.com/prometheus/exporter-toolkit/blob/master/CHANGELOG.md)
- [Commits](prometheus/exporter-toolkit@v0.8.2...v0.9.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/exporter-toolkit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump github.com/prometheus/exporter-toolkit from 0.9.0 to 0.9.1 (iamseth#295)

Bumps [github.com/prometheus/exporter-toolkit](https://github.com/prometheus/exporter-toolkit) from 0.9.0 to 0.9.1.
- [Release notes](https://github.com/prometheus/exporter-toolkit/releases)
- [Changelog](https://github.com/prometheus/exporter-toolkit/blob/master/CHANGELOG.md)
- [Commits](prometheus/exporter-toolkit@v0.9.0...v0.9.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/exporter-toolkit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump github.com/prometheus/common from 0.41.0 to 0.42.0 (iamseth#296)

Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.41.0 to 0.42.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.41.0...v0.42.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix broken link (iamseth#298)

* 👷 Update packages versions + clean up

* Update packages versions + clean up
* Use Oracle image to retrieve binaries
* Use FQN for docker image

* 🐛 Fix oraclelinux image build

* 🔧 Use a parameter to set oracle client version

* remove percent and hyphen (iamseth#302)

Some oracledb tables return names with % and -

* try to resolve scrape interval of 0 implications

* fix scrape interval nil check

* fix synchronization

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Nikolay Pelov <npelov@gmail.com>
Co-authored-by: Viktor Utkin <vutkin@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nikolay Pelov <npelov@gmail.com>
Co-authored-by: caiwc <wc1002075582@qq.com>
Co-authored-by: wccai <wccai@easyops.cn>
Co-authored-by: wccai <wccai@easyops>
Co-authored-by: Yannig Perré <yannig.perre@aios.sh>
Co-authored-by: markruler <imcxsu@gmail.com>
Co-authored-by: Yannig <yannig.perre@gmail.com>
Co-authored-by: Egor Sidortsov <marquizee@yandex.ru>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants