Skip to content

Commit e1edac2

Browse files
authored
preparing for 1.5.0 release (#127)
Signed-off-by: Mark Nelson <[email protected]>
1 parent 653bc56 commit e1edac2

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

Diff for: Makefile

+1-4
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,9 @@ push-images:
8585
docker:
8686
docker build --no-cache --progress=plain $(BUILD_ARGS) -t "$(IMAGE_ID)" --build-arg BASE_IMAGE=$(ORACLE_LINUX_BASE_IMAGE) .
8787

88-
docker-ampere:
88+
docker-arm:
8989
docker build --no-cache --progress=plain $(BUILD_ARGS) -t "$(IMAGE_ID)" --build-arg BASE_IMAGE=$(ORACLE_LINUX_BASE_IMAGE) --build-arg GOARCH=arm64 .
9090

91-
docker-mac-arm:
92-
docker build --no-cache --progress=plain $(BUILD_ARGS) -t "$(IMAGE_ID)" --build-arg BASE_IMAGE=$(ORACLE_LINUX_BASE_IMAGE) --build-arg GOOS=darwin --build-arg GOARCH=arm64 .
93-
9491
push-oraclelinux-image:
9592
docker push $(IMAGE_ID)
9693

Diff for: README.md

+11
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ Now, you provide the connection details using these variables:
482482
- `DB_USERNAME` is the database username, e.g., `pdbadmin`
483483
- `DB_PASSWORD` is the password for that user, e.g., `Welcome12345`
484484
- `DB_CONNECT_STRING` is the connection string, e.g., `devdb_tp?TNS_ADMIN=/wallet`
485+
- `DB_ROLE` (Optional) can be set to `SYSDBA` or `SYSOPER` if you want to connect with one of those roles, however Oracle recommends that you connect with the lowest possible privileges and roles necessary for the exporter to run.
485486
- `ORACLE_HOME` is the location of the Oracle Instant Client, i.e., `/lib/oracle/21/client64/lib`. If you built your own container image, the path may be different.
486487

487488
To run the exporter in a container and expose the port, use a command like this, with the appropriate values for the environment variables, and mounting your `wallet` directory as `/wallet` in the container to provide access to the wallet:
@@ -656,6 +657,14 @@ Usage of oracledb_exporter:
656657
657658
```
658659

660+
You may provide the connection details using these variables:
661+
662+
- `DB_USERNAME` is the database username, e.g., `pdbadmin`
663+
- `DB_PASSWORD` is the password for that user, e.g., `Welcome12345`
664+
- `DB_CONNECT_STRING` is the connection string, e.g., `devdb_tp?TNS_ADMIN=/wallet`
665+
- `DB_ROLE` (Optional) can be set to `SYSDBA` or `SYSOPER` if you want to connect with one of those roles, however Oracle recommends that you connect with the lowest possible privileges and roles necessary for the exporter to run.
666+
- `ORACLE_HOME` is the location of the Oracle Instant Client, e.g., `/lib/oracle/21/client64/lib`.
667+
659668
### Using OCI Vault
660669

661670
The exporter will read the password from a secret stored in OCI Vault if you set these two environment
@@ -664,6 +673,8 @@ variables:
664673
- `VAULT_ID` should be set to the OCID of the OCI vault that you wish to use
665674
- `VAULT_SECRET_NAME` should be set to the name of the secret in the OCI vault which contains the database password
666675

676+
Note that the process must be running under a user that has the OCI CLI installed and configured correctly to access the desired tenancy and region.
677+
667678
## Custom metrics
668679

669680
The exporter allows definition of arbitrary custom metrics in one or more TOML files. To specify this file to the

0 commit comments

Comments
 (0)