Skip to content

Commit 30dbd2e

Browse files
committed
Refine docs
1 parent ff5f3c1 commit 30dbd2e

File tree

13 files changed

+42
-10
lines changed

13 files changed

+42
-10
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Changelog
22
==========
33

4+
## OJR Release v0.6.1
5+
6+
- Some improvements of IBM MQ Receiver/Agent
7+
- Fix some documents issue
8+
49
## OJR Release v0.6.0
510

611
- Handled cardinality related concerns

README.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,13 @@ User can use `OJR_CONFIG` environment variable or Java system property to specif
7171

7272
According to the Java convention, the logging configuration file can also be specified by `java.util.logging.config.file` system property.
7373

74-
User can also just specify the file directory of the OJR configuration file and logging configuration file by `OJR_DIR` environment variable or Java system property. For example, `OJR_DIR=/path/to/config/dir`.
74+
User can also just specify the file directory of the OJR configuration file and logging configuration file by `OJR_DIR` environment variable or Java system property. For example, `OJR_DIR=/path/to/config/dir`.
75+
76+
77+
## Some advanced configurations
78+
79+
OJR recognizes the following standard OpenTelemetry environment variables:
80+
81+
- `OTEL_RESOURCE_ATTRIBUTES` is used to add more OpenTelemetry resource attributes. For example, OTEL_RESOURCE_ATTRIBUTES="custom.bizID=xxx,customer.bizName=yyy".
82+
- `OTEL_EXPORTER_OTLP_HEADERS` is used to add more HTTP headers to the built-in OTLP exporter. For example, OTEL_EXPORTER_OTLP_HEADERS="api-key=key,other-config-value=value".
83+
- `OTEL_EXPORTER_OTLP_CERTIFICATE` is used to specify the path of the certificate file for the built-in OTLP exporter. For example, OTEL_EXPORTER_OTLP_CERTIFICATE='/tmp/lr/servercert.cer'.

ojr-dameng-db/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ applicationDistribution.from("config") {
4747
}
4848

4949
applicationDistribution.from("logs") {
50+
include "PLACE_HOLDER"
5051
into "logs"
5152
}
5253

54+
5355
test {
5456
useJUnitPlatform()
5557
}

ojr-ibmmq/build.gradle

+5
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ applicationDistribution.from("scripts") {
4949
into "scripts"
5050
}
5151

52+
applicationDistribution.from("logs") {
53+
include "PLACE_HOLDER"
54+
into "logs"
55+
}
56+
5257
test {
5358
useJUnitPlatform()
5459
}

ojr-ibmmq/config/config.yaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ instances:
1212
#cipherSuite: TLS_RSA_WITH_AES_256_CBC_SHA256
1313

1414
## Data collector properties:
15-
poll.interval: 25
16-
callback.interval: 30
15+
otel.poll.interval: 25
16+
otel.callback.interval: 30
1717
#otel.backend.url: http://localhost:4318
1818
otel.transport: prometheus
1919
prometheus.port: 16543
@@ -22,6 +22,7 @@ instances:
2222
isLocal: false
2323
#user: liurui
2424
#password: xxxxxxxx
25+
#host: 192.168.1.1
2526
#port: 1414
2627
queuesMonitored: Q*
2728
#customEventQueues:
@@ -30,8 +31,8 @@ instances:
3031
#cipherSuite: TLS_RSA_WITH_AES_256_CBC_SHA256
3132

3233
## Data collector properties:
33-
poll.interval: 25
34-
callback.interval: 30
34+
otel.poll.interval: 25
35+
otel.callback.interval: 30
3536
#otel.backend.url: http://localhost:4318
3637
otel.transport: prometheus
3738
prometheus.port: 16543

ojr-informix-db/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,11 @@ applicationDistribution.from("config") {
4949
}
5050

5151
applicationDistribution.from("logs") {
52+
include "PLACE_HOLDER"
5253
into "logs"
5354
}
5455

56+
5557
applicationDistribution.from("scripts/informix") {
5658
into "scripts"
5759
}

ojr-informix-db/config/config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ instances:
1818
otel.service.name: InformixDB
1919

2020
#Data collector properties:
21-
#Either use `poll.interval` or `custom.poll.interval`
21+
#Either use `otel.poll.interval` or `custom.poll.interval`
2222
otel.poll.interval: 25
2323
#All three category value is Mandatory if leveraging Custom Poll Rate
2424
custom.poll.interval:

ojr-linux-host/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@ applicationDistribution.from("config") {
4545
}
4646

4747
applicationDistribution.from("logs") {
48+
include "PLACE_HOLDER"
4849
into "logs"
4950
}
5051

52+
5153
applicationDistribution.from("scripts") {
5254
into "scripts"
5355
}

ojr-mq-appliance/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@ applicationDistribution.from("config") {
4545
}
4646

4747
applicationDistribution.from("logs") {
48+
include "PLACE_HOLDER"
4849
into "logs"
4950
}
5051

52+
5153
applicationDistribution.from("scripts") {
5254
into "scripts"
5355
}

ojr-mq-appliance/config/config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ instances:
66
appliance.password: xxxxxxxx
77

88
#Data collector properties:
9-
poll.interval: 25
10-
callback.interval: 30
9+
otel.poll.interval: 25
10+
otel.callback.interval: 30
1111
#otel.backend.url: http://localhost:4317
1212
otel.backend.url: http://localhost:4318
1313
otel.transport: http+prometheus

ojr-oceanbase-db/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ applicationDistribution.from("config") {
4747
}
4848

4949
applicationDistribution.from("logs") {
50+
include "PLACE_HOLDER"
5051
into "logs"
5152
}
5253

54+
5355
test {
5456
useJUnitPlatform()
5557
}

ojr-snmp-host/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ applicationDistribution.from("config") {
4747
}
4848

4949
applicationDistribution.from("logs") {
50+
include "PLACE_HOLDER"
5051
into "logs"
5152
}
5253

54+
5355
applicationDistribution.from("scripts") {
5456
into "scripts"
5557
}

ojr-snmp-host/config/config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ host.system: snmp_host
22

33
instances:
44
- snmp.host: udp:9.30.78.59/161
5-
poll.interval: 25
6-
callback.interval: 30
5+
otel.poll.interval: 25
6+
otel.callback.interval: 30
77
#otel.backend.url: http://localhost:4317
88
otel.backend.url: http://localhost:4318
99
otel.transport: http+prometheus

0 commit comments

Comments
 (0)