updates for 1.4.0 (#121)

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

Author: markxnelson

Dockerfile

@@ -25,7 +25,8 @@ 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
+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
 
 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.3.1
+VERSION        ?= 1.4.0
 LDFLAGS        := -X main.Version=$(VERSION)
 GOFLAGS        := -ldflags "$(LDFLAGS) -s -w"
 BUILD_ARGS      = --build-arg VERSION=$(VERSION)

README.md

@@ -28,6 +28,16 @@ Contributions are welcome - please see [contributing](CONTRIBUTING.md).
 
 ## Release Notes
 
+### Version 1.4.0, September 4, 2024
+
+This release includes the following changes:
+
+- Allow mulitple custom metrics defintion files.
+- Allow query timeout per-metric.
+- Allow scrape interval per-metric.
+- Updated some third-party dependencies.
+
+
 ### Version 1.3.1, July 22, 2024
 
 This release includes the following changes:

docker-compose/compose.yaml

@@ -51,7 +51,7 @@ services:
       - DB_USERNAME=pdbadmin
       - DB_PASSWORD=Welcome12345
       - DB_CONNECT_STRING=free23ai:1521/freepdb1
-      - CUSTOM_METRICS=/exporter/txeventq-metrics.toml
+      - CUSTOM_METRICS=/exporter/txeventq-metrics.toml,/exporter/more-txeventq-metrics.toml
     volumes:
       - ./exporter:/exporter
     depends_on: 

docker-compose/exporter/more-txeventq-metrics.toml

@@ -0,0 +1,42 @@
+[[metric]]
+context = "teq"
+labels = ["inst_id", "queue_name", "subscriber_name"]
+metricsdesc = { enqueued_msgs = "Total enqueued messages.", dequeued_msgs = "Total dequeued messages.", remained_msgs = "Total remained messages.", time_since_last_dequeue = "Time since last dequeue.", estd_time_to_drain_no_enq = "Estimated time to drain if no enqueue.", message_latency_1 = "Message latency for last 5 mins.", message_latency_2 = "Message latency for last 1 hour.", message_latency_3 = "Message latency for last 5 hours."}
+request = '''
+SELECT DISTINCT
+    t1.inst_id,
+    t1.queue_id,
+    t2.queue_name,
+    t1.subscriber_id AS subscriber_name,
+    t1.enqueued_msgs,
+    t1.dequeued_msgs,
+    t1.remained_msgs,
+    t1.time_since_last_dequeue,
+    t1.estd_time_to_drain_no_enq,
+    t1.message_latency_1,
+    t1.message_latency_2,
+    t1.message_latency_3
+FROM
+    (
+        SELECT
+            inst_id,
+            queue_id,
+            subscriber_id,
+            SUM(enqueued_msgs) AS enqueued_msgs,
+            SUM(dequeued_msgs) AS dequeued_msgs,
+            SUM(enqueued_msgs - dequeued_msgs) AS remained_msgs,
+            MIN(time_since_last_dequeue) AS time_since_last_dequeue,
+            MAX(estd_time_to_drain_no_enq) AS estd_time_to_drain_no_enq,
+            AVG(10) AS message_latency_1,
+            AVG(20) AS message_latency_2,
+            AVG(30) AS message_latency_3
+        FROM
+            gv$aq_sharded_subscriber_stat
+        GROUP BY
+            queue_id,
+            subscriber_id,
+            inst_id
+    ) t1
+    JOIN gv$persistent_queues t2 ON t1.queue_id = t2.queue_id
+'''
+ignorezeroresult = true

docker-compose/exporter/txeventq-metrics.toml

@@ -10,6 +10,8 @@ WHERE
     ROWNUM < 2
 '''
 ignorezeroresult = true
+querytimeout = "10s"
+scrapeinterval = "30s"
 
 [[metric]]
 context = "teq"
@@ -59,46 +61,3 @@ GROUP BY
     inst_id
 '''
 ignorezeroresult = true
-
-[[metric]]
-context = "teq"
-labels = ["inst_id", "queue_name", "subscriber_name"]
-metricsdesc = { enqueued_msgs = "Total enqueued messages.", dequeued_msgs = "Total dequeued messages.", remained_msgs = "Total remained messages.", time_since_last_dequeue = "Time since last dequeue.", estd_time_to_drain_no_enq = "Estimated time to drain if no enqueue.", message_latency_1 = "Message latency for last 5 mins.", message_latency_2 = "Message latency for last 1 hour.", message_latency_3 = "Message latency for last 5 hours."}
-request = '''
-SELECT DISTINCT
-    t1.inst_id,
-    t1.queue_id,
-    t2.queue_name,
-    t1.subscriber_id AS subscriber_name,
-    t1.enqueued_msgs,
-    t1.dequeued_msgs,
-    t1.remained_msgs,
-    t1.time_since_last_dequeue,
-    t1.estd_time_to_drain_no_enq,
-    t1.message_latency_1,
-    t1.message_latency_2,
-    t1.message_latency_3
-FROM
-    (
-        SELECT
-            inst_id,
-            queue_id,
-            subscriber_id,
-            SUM(enqueued_msgs) AS enqueued_msgs,
-            SUM(dequeued_msgs) AS dequeued_msgs,
-            SUM(enqueued_msgs - dequeued_msgs) AS remained_msgs,
-            MIN(time_since_last_dequeue) AS time_since_last_dequeue,
-            MAX(estd_time_to_drain_no_enq) AS estd_time_to_drain_no_enq,
-            AVG(10) AS message_latency_1,
-            AVG(20) AS message_latency_2,
-            AVG(30) AS message_latency_3
-        FROM
-            gv$aq_sharded_subscriber_stat
-        GROUP BY
-            queue_id,
-            subscriber_id,
-            inst_id
-    ) t1
-    JOIN gv$persistent_queues t2 ON t1.queue_id = t2.queue_id
-'''
-ignorezeroresult = true

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

@@ -6,7 +6,7 @@ spring:
       enabled: true
 
   datasource:
-    url: jdbc:oracle:thin:@//172.23.0.3:1521/freepdb1
+    url: jdbc:oracle:thin:@//172.20.0.4:1521/freepdb1
     username: pdbadmin
     password: Welcome12345
     driver-class-name: oracle.jdbc.OracleDriver
@@ -16,4 +16,4 @@ spring:
       connection-pool-name: TollReaderConnectionPool
       initial-pool-size: 15
       min-pool-size: 10
-      max-pool-size: 30
+      max-pool-size: 30