Release 1.5.0 (#123)

* add arm build
* use faster 23ai image
* update go version in built images
* upgrade godror
* update prom dep
* update ocisdk
* udpate versions
* update readme, dashboard

---------

Signed-off-by: Mark Nelson <mark.x.nelson@oracle.com>

Author: markxnelson

Dockerfile

@@ -1,11 +1,17 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE} AS build
 
+ARG GOOS
+ENV GOOS ${GOOS:-linux}
+
+ARG GOARCH
+ENV GOARCH ${GOARCH:-amd64}
+
 RUN microdnf install wget gzip gcc && \
-    wget -q https://go.dev/dl/go1.22.4.linux-amd64.tar.gz && \
+    wget -q https://go.dev/dl/go1.22.7.${GOOS}-${GOARCH}.tar.gz && \
     rm -rf /usr/local/go && \
-    tar -C /usr/local -xzf go1.22.4.linux-amd64.tar.gz && \
-    rm go1.22.4.linux-amd64.tar.gz
+    tar -C /usr/local -xzf go1.22.7.${GOOS}-${GOARCH}.tar.gz && \
+    rm go1.22.7.${GOOS}-${GOARCH}.tar.gz
 
 ENV PATH $PATH:/usr/local/go/bin
 
@@ -16,7 +22,7 @@ RUN go get -d -v
 ARG VERSION
 ENV VERSION ${VERSION:-1.0.0}
 
-RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -v -ldflags "-X main.Version=${VERSION} -s -w"
+RUN CGO_ENABLED=1 GOOS=${GOOS} GOARCH=${GOARCH} go build -v -ldflags "-X main.Version=${VERSION} -s -w"
 
 FROM ${BASE_IMAGE} as exporter
 LABEL org.opencontainers.image.authors="Oracle America, Inc."
@@ -25,8 +31,14 @@ LABEL org.opencontainers.image.description="Oracle Database Observability Export
 ENV VERSION ${VERSION:-1.0.0}
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN microdnf install -y oracle-instantclient-release-el8 && microdnf install -y oracle-instantclient-basic && \
-    microdnf install glibc-2.28-251.0.2.el8_10.4
+RUN if [ "$GOARCH" = "amd64" ]; then \
+      microdnf install -y oracle-instantclient-release-el8 && microdnf install -y oracle-instantclient-basic && \
+      microdnf install glibc-2.28-251.0.2.el8_10.4 \
+    ; else \
+      microdnf install oracle-release-el8 && \
+      microdnf install -y oracle-instantclient19.23-basic && \
+      microdnf install glibc-2.28-251.0.2.el8_10.4 \
+    ; fi
 
 ENV LD_LIBRARY_PATH /usr/lib/oracle/21/client64/lib
 ENV PATH $PATH:/usr/lib/oracle/21/client64/bin

Makefile

@@ -3,7 +3,7 @@ OS_TYPE        ?= $(shell uname -s | tr '[:upper:]' '[:lower:]')
 ARCH_TYPE      ?= $(subst x86_64,amd64,$(patsubst i%86,386,$(ARCH)))
 GOOS           ?= $(shell go env GOOS)
 GOARCH         ?= $(shell go env GOARCH)
-VERSION        ?= 1.4.0
+VERSION        ?= 1.5.0
 LDFLAGS        := -X main.Version=$(VERSION)
 GOFLAGS        := -ldflags "$(LDFLAGS) -s -w"
 BUILD_ARGS      = --build-arg VERSION=$(VERSION)
@@ -85,6 +85,12 @@ push-images:
 docker:
 	docker build --no-cache --progress=plain $(BUILD_ARGS) -t "$(IMAGE_ID)" --build-arg BASE_IMAGE=$(ORACLE_LINUX_BASE_IMAGE) . 
 
+docker-ampere:
+	docker build --no-cache --progress=plain $(BUILD_ARGS) -t "$(IMAGE_ID)" --build-arg BASE_IMAGE=$(ORACLE_LINUX_BASE_IMAGE) --build-arg GOARCH=arm64 . 
+
+docker-mac-arm:
+	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 . 
+
 push-oraclelinux-image:
 	docker push $(IMAGE_ID)
 

README.md

@@ -28,6 +28,14 @@ Contributions are welcome - please see [contributing](CONTRIBUTING.md).
 
 ## Release Notes
 
+### Version 1.5.0, September 26, 2024
+
+This release includes the following changes:
+
+- Support for running the exporter on ARM processors (darwin and linux).
+- Updated some third-party dependencies.
+- Updated the "test/demo environment" to use newer version of Oracle Database (23.5.0.24.07) and faster startup.
+
 ### Version 1.4.0, September 4, 2024
 
 This release includes the following changes:
@@ -37,7 +45,6 @@ This release includes the following changes:
 - Allow scrape interval per-metric.
 - Updated some third-party dependencies.
 
-
 ### Version 1.3.1, July 22, 2024
 
 This release includes the following changes:
@@ -459,7 +466,7 @@ docker run -it --rm \
     -e DB_PASSWORD=Welcome12345 \
     -e DB_CONNECT_STRING=free23ai:1521/freepdb \
     -p 9161:9161 \
-    container-registry.oracle.com/database/observability-exporter:1.4.0
+    container-registry.oracle.com/database/observability-exporter:1.5.0
 ```
 
 ##### Using a wallet
@@ -486,7 +493,7 @@ docker run -it --rm \
     -e DB_CONNECT_STRING=devdb_tp \
     -v ./wallet:/wallet \
     -p 9161:9161 \
-    container-registry.oracle.com/database/observability-exporter:1.4.0
+    container-registry.oracle.com/database/observability-exporter:1.5.0
 ```
 
 
@@ -765,7 +772,7 @@ An exmaple of [custom metrics for Transacational Event Queues](./custom-metrics-
 If you run the exporter as a container image and want to include your custom metrics in the image itself, you can use the following example `Dockerfile` to create a new image:
 
 ```Dockerfile
-FROM container-registry.oracle.com/database/observability-exporter:1.4.0
+FROM container-registry.oracle.com/database/observability-exporter:1.5.0
 COPY custom-metrics.toml /
 ENTRYPOINT ["/oracledb_exporter", "--custom.metrics", "/custom-metrics.toml"]
 ```

doc/oracledb-dashboard.png

@@ -27,14 +27,14 @@ services:
       - ./grafana/dashboards:/var/lib/grafana/dashboards
 
   free23ai:
-    image: container-registry.oracle.com/database/free:latest
+    image: gvenzl/oracle-free:23.5-slim-faststart
     container_name: free23ai
     ports:
       - 1521:1521
     environment:
-      - ORACLE_PWD=Welcome12345
+      - ORACLE_PASSWORD=Welcome12345
     volumes:
-      - ./oracle:/opt/oracle/scripts/startup
+      - ./oracle:/container-entrypoint-initdb.d
     healthcheck:
       test: ["CMD-SHELL", "lsnrctl status | grep READY"]
       interval: 15s
@@ -43,7 +43,7 @@ services:
       start_period: 30s
 
   exporter:
-    image: container-registry.oracle.com/database/observability-exporter:1.4.0
+    image: container-registry.oracle.com/database/observability-exporter:1.5.0
     container_name: exporter
     ports:
       - 9161:9161

docker-compose/compose.yaml

@@ -1,4 +1,5 @@
 alter session set container=freepdb1;
+alter user pdbadmin identified by "Welcome12345";
 grant unlimited tablespace to pdbadmin;
 grant select_catalog_role to pdbadmin;
 grant execute on dbms_aq to pdbadmin;

docker-compose/oracle/grant_permissions.sql

@@ -6,8 +6,8 @@ spring:
       enabled: true
 
   datasource:
-    url: jdbc:oracle:thin:@//172.20.0.4:1521/freepdb1
-    username: pdbadmin
+    url: jdbc:oracle:thin:@//172.24.0.3:1521/freepdb1
+    username: system
     password: Welcome12345
     driver-class-name: oracle.jdbc.OracleDriver
     type: oracle.ucp.jdbc.PoolDataSource

docker-compose/txeventq-load/src/main/resources/application.yaml

@@ -8,10 +8,10 @@ require (
 	github.com/BurntSushi/toml v1.4.0
 	github.com/alecthomas/kingpin/v2 v2.4.0
 	github.com/go-kit/log v0.2.1
-	github.com/godror/godror v0.44.6
-	github.com/oracle/oci-go-sdk/v65 v65.73.0
+	github.com/godror/godror v0.44.7
+	github.com/oracle/oci-go-sdk/v65 v65.75.0
 	github.com/prometheus/client_golang v1.20.2
-	github.com/prometheus/common v0.58.0
+	github.com/prometheus/common v0.59.1
 	github.com/prometheus/exporter-toolkit v0.11.0
 )
 

go.mod

@@ -24,6 +24,8 @@ github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/godror/godror v0.44.6 h1:3Aw45jpKkPsss80DVy4/XiqXUPCsHmW0efSHBQFi0h4=
 github.com/godror/godror v0.44.6/go.mod h1:KJwMtQpK9o3WdEiNw7qvgSk827YDLj9MV/bXSzvUzlo=
+github.com/godror/godror v0.44.7 h1:fGxtxozidwBR3C1FVTrMiH77maOnMA4HqltDS/YM7O0=
+github.com/godror/godror v0.44.7/go.mod h1:KJwMtQpK9o3WdEiNw7qvgSk827YDLj9MV/bXSzvUzlo=
 github.com/godror/knownpb v0.1.2 h1:icMyYsYVpGmzhoVA01xyd0o4EaubR31JPK1UxQWe4kM=
 github.com/godror/knownpb v0.1.2/go.mod h1:zs9hH+lwj7mnPHPnKCcxdOGz38Axa9uT+97Ng+Nnu5s=
 github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
@@ -48,6 +50,8 @@ github.com/oklog/ulid/v2 v2.0.2 h1:r4fFzBm+bv0wNKNh5eXTwU7i85y5x+uwkxCUTNVQqLc=
 github.com/oklog/ulid/v2 v2.0.2/go.mod h1:mtBL0Qe/0HAx6/a4Z30qxVIAL1eQDweXq5lxOEiwQ68=
 github.com/oracle/oci-go-sdk/v65 v65.73.0 h1:C7uel6CoKk4A1KPkdhFBAyvVyFRTHAmX8m0o64RmfPg=
 github.com/oracle/oci-go-sdk/v65 v65.73.0/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
+github.com/oracle/oci-go-sdk/v65 v65.75.0 h1:tifYRSqCjxANJb0xnMSZ6N2bF2xGyqcCIMg7xihgk+s=
+github.com/oracle/oci-go-sdk/v65 v65.75.0/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg=
@@ -56,6 +60,8 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/common v0.58.0 h1:N+N8vY4/23r6iYfD3UQZUoJPnUYAo7v6LG5XZxjZTXo=
 github.com/prometheus/common v0.58.0/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
+github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0=
+github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
 github.com/prometheus/exporter-toolkit v0.11.0 h1:yNTsuZ0aNCNFQ3aFTD2uhPOvr4iD7fdBvKPAEGkNf+g=
 github.com/prometheus/exporter-toolkit v0.11.0/go.mod h1:BVnENhnNecpwoTLiABx7mrPB/OLRIgN74qlQbV+FK1Q=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=