Caiwc/multi target #234

caiwc · 2022-03-24T08:45:38Z

No description provided.

vutkin · 2023-02-07T10:59:58Z

Hi @caiwc , could you please rebase it from master and bump a version in Makefile?

vutkin · 2023-02-08T16:34:53Z

Hi @Yannig , do we still need it?

rebase branch && update Makefile version

caiwc · 2023-02-08T17:06:08Z

done

vutkin · 2023-02-08T17:11:33Z

Hi @caiwc,
Could you please update README.md about this changes? For ex.: added new metrics endpoint (for prometheus) /scrape. Smth like this.

caiwc · 2023-02-08T17:42:49Z

Hi @caiwc, Could you please update README.md about this changes? For ex.: added new metrics endpoint (for prometheus) /scrape. Smth like this.

👌，done

Yannig · 2023-02-10T19:37:35Z

README.md

+
+This exporter supports the multi-target pattern. This allows running a single instance of this exporter for multiple Oracle targets.
+
+To use the multi-target functionality, send a http request to the endpoint `/scrape?target=foo:5432` where target is set to the DSN of the Oracle instance to scrape metrics from.


Here the example is referring to a postgres port. 😁

Not very important but maybe a more realistic value (1521 for example) should be better to avoid confusion : we have no plan to support this 😇 at least for the moment.

done, corrected to 1521.
just didn't notice it at that time 😂

Yannig · 2023-02-10T19:40:17Z

main.go

@@ -621,3 +622,19 @@ func main() {
 		os.Exit(1)
 	}
 }
+
+func scrapeHandle(logger log.Logger) func(w http.ResponseWriter, r *http.Request) {


I don't know if it's relevant but I wonder what the logger will show about the user request. If so we may have some way to hide credentials.

This function looks like would hide credentials.

oracledb_exporter/main.go

Line 108 in aad2f8e

func maskDsn(dsn string) string {

And logger would run in this way.
level.Debug(logger).Log("msg", "Launching connection", "dsn", maskDsn(dsn))

Yannig · 2023-02-11T15:38:31Z

LGTM. Go ahead and let's merge this.

Thanks for your contribution.

* 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>

caiwc force-pushed the caiwc/multi-target branch 2 times, most recently from 86c21c8 to b449d09 Compare February 8, 2023 17:04

feat(): support scrape multi target

679ef42

rebase branch && update Makefile version

caiwc force-pushed the caiwc/multi-target branch from b449d09 to 679ef42 Compare February 8, 2023 17:05

add multi-target explain to readme

c1849fc

Yannig reviewed Feb 10, 2023

View reviewed changes

docs: correct dns example port of readme

59ea94c

Yannig merged commit da042f8 into iamseth:master Feb 11, 2023

xafer337 mentioned this pull request Jun 15, 2023

Multi target broken after release 0.5.0 #339

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Caiwc/multi target #234

Caiwc/multi target #234

caiwc commented Mar 24, 2022

vutkin commented Feb 7, 2023

vutkin commented Feb 8, 2023

caiwc commented Feb 8, 2023

vutkin commented Feb 8, 2023

caiwc commented Feb 8, 2023

Yannig Feb 10, 2023

caiwc Feb 11, 2023

Yannig Feb 10, 2023

caiwc Feb 11, 2023 •

edited

Loading

Yannig commented Feb 11, 2023


		This exporter supports the multi-target pattern. This allows running a single instance of this exporter for multiple Oracle targets.

		To use the multi-target functionality, send a http request to the endpoint `/scrape?target=foo:5432` where target is set to the DSN of the Oracle instance to scrape metrics from.

Caiwc/multi target #234

Caiwc/multi target #234

Conversation

caiwc commented Mar 24, 2022

vutkin commented Feb 7, 2023

vutkin commented Feb 8, 2023

caiwc commented Feb 8, 2023

vutkin commented Feb 8, 2023

caiwc commented Feb 8, 2023

Yannig Feb 10, 2023

Choose a reason for hiding this comment

caiwc Feb 11, 2023

Choose a reason for hiding this comment

Yannig Feb 10, 2023

Choose a reason for hiding this comment

caiwc Feb 11, 2023 • edited Loading

Choose a reason for hiding this comment

Yannig commented Feb 11, 2023

caiwc Feb 11, 2023 •

edited

Loading