Skip to content

Commit ec49bcc

Browse files
greatestusernamegreatestusername
committed
changes for DBMon correlation
1 parent 55bb0e4 commit ec49bcc

File tree

4 files changed

+69
-117
lines changed

4 files changed

+69
-117
lines changed

‎src/shop-dc-shim/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN mkdir -p $APPDYNAMICS_AGENT_BASE_DIR $OPENTELEMETRY_AGENT_DIR && \
3535
chown -R shopdc:shopdc $APPDYNAMICS_AGENT_BASE_DIR $OPENTELEMETRY_AGENT_DIR
3636

3737
# Download OpenTelemetry Java agent for Splunk Observability andlatest AppDynamics Java agent
38-
ADD --chown=shopdc:shopdc https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar $OPENTELEMETRY_AGENT_DIR/opentelemetry-javaagent.jar
38+
ADD --chown=shopdc:shopdc https://github.com/signalfx/splunk-otel-java/releases/latest/download/splunk-otel-javaagent.jar $OPENTELEMETRY_AGENT_DIR/opentelemetry-javaagent.jar
3939

4040
RUN cd /tmp && \
4141
echo "Fetching latest AppDynamics Java agent..." && \

‎src/shop-dc-shim/build-image-quay-dev.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set -e
33

44
REGISTRY="quay.io"
55
NAMESPACE="jeremyh"
6-
SHOP_IMAGE="${REGISTRY}/${NAMESPACE}/shop-dc-shim:0.0.1"
7-
LOAD_GEN_IMAGE="${REGISTRY}/${NAMESPACE}/shop-dc-load-generator:0.0.1"
6+
SHOP_IMAGE="${REGISTRY}/${NAMESPACE}/shop-dc-shim:latest"
7+
LOAD_GEN_IMAGE="${REGISTRY}/${NAMESPACE}/shop-dc-load-generator:latest"
88

99
# Build shop-dc-shim service
1010
docker buildx build --platform linux/amd64 -t ${SHOP_IMAGE} -f ./Dockerfile --push --progress=plain .

‎src/shop-dc-shim/dbmon-values.yaml‎

Lines changed: 58 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,71 @@
11
### VALUES FOR DBSHIM DBMon
22
agent:
33
config:
4-
exporters:
5-
debug:
6-
verbosity: detailed
7-
otlphttp/dbmon:
8-
headers:
9-
X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
10-
X-splunk-instrumentation-library: dbmon
11-
logs_endpoint: https://ingest.us1.signalfx.com/v3/event
12-
sending_queue:
13-
batch:
14-
flush_timeout: 15s
15-
max_size: 10485760 # 10 MiB
16-
sizer: bytes
17-
receivers:
18-
sqlserver:
19-
collection_interval: 10s
20-
username: sa
21-
password: ShopPass123!
22-
server: shop-dc-shim-db
23-
port: 1433
24-
resource_attributes:
25-
sqlserver.computer.name:
26-
enabled: true
27-
sqlserver.instance.name:
28-
enabled: true
29-
events:
30-
db.server.query_sample:
31-
enabled: true
32-
db.server.top_query:
33-
enabled: true
34-
metrics:
35-
# Enable all OOTB dashboard default metrics
36-
sqlserver.batch.request.rate:
37-
enabled: true
38-
sqlserver.batch.sql_compilation.rate:
39-
enabled: true
40-
sqlserver.batch.sql_recompilation.rate:
41-
enabled: true
42-
sqlserver.database.count:
43-
enabled: true
44-
sqlserver.database.io:
45-
enabled: true
46-
sqlserver.database.latency:
47-
enabled: true
48-
sqlserver.database.operations:
49-
enabled: true
50-
sqlserver.deadlock.rate:
51-
enabled: true
52-
sqlserver.lock.wait.count:
53-
enabled: true
54-
sqlserver.lock.wait.rate:
55-
enabled: true
56-
sqlserver.os.wait.duration:
57-
enabled: true
58-
sqlserver.page.buffer_cache.hit_ratio:
59-
enabled: true
60-
sqlserver.processes.blocked:
61-
enabled: true
62-
sqlserver.resource_pool.disk.operations:
63-
enabled: true
64-
sqlserver.resource_pool.disk.throttled.read.rate:
65-
enabled: true
66-
sqlserver.resource_pool.disk.throttled.write.rate:
67-
enabled: true
68-
sqlserver.user.connection.count:
69-
enabled: true
70-
# Disable upstream default metrics that OOTB dashboards don't use
71-
sqlserver.lock.wait_time.avg:
72-
enabled: false
73-
sqlserver.page.checkpoint.flush.rate:
74-
enabled: false
75-
sqlserver.page.lazy_write.rate:
76-
enabled: false
77-
sqlserver.page.life_expectancy:
78-
enabled: false
79-
sqlserver.page.operation.rate:
80-
enabled: false
81-
sqlserver.page.split.rate:
82-
enabled: false
83-
sqlserver.transaction.rate:
84-
enabled: false
85-
sqlserver.transaction.write.rate:
86-
enabled: false
87-
sqlserver.transaction_log.flush.data.rate:
88-
enabled: false
89-
sqlserver.transaction_log.flush.rate:
90-
enabled: false
91-
sqlserver.transaction_log.flush.wait.rate:
92-
enabled: false
93-
sqlserver.transaction_log.growth.count:
94-
enabled: false
95-
sqlserver.transaction_log.shrink.count:
96-
enabled: false
97-
sqlserver.transaction_log.usage:
98-
enabled: false
994
service:
1005
pipelines:
101-
logs/dbmon:
102-
exporters:
103-
- otlphttp/dbmon
104-
- debug
105-
processors:
106-
- memory_limiter
107-
- batch
108-
- resourcedetection
109-
receivers:
110-
- sqlserver
111-
metrics/mssql:
6+
metrics:
1127
exporters:
113-
- otlphttp
1148
- signalfx
115-
- debug
1169
processors:
11710
- memory_limiter
11811
- batch
11912
- resourcedetection
12013
- resource
12114
receivers:
122-
- sqlserver
15+
- hostmetrics
16+
- kubeletstats
17+
- otlp
18+
- receiver_creator
19+
clusterReceiver:
20+
enabled: true
21+
config:
22+
exporters:
23+
signalfx:
24+
api_url: https://app.us1.signalfx.com
25+
# Exports dbmon events as logs
26+
otlphttp/dbmon:
27+
headers:
28+
X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
29+
X-splunk-instrumentation-library: dbmon
30+
logs_endpoint: https://ingest.us1.signalfx.com/v3/event
31+
sending_queue:
32+
batch:
33+
flush_timeout: 15s
34+
max_size: 10485760 # 10 MiB
35+
sizer: bytes
36+
receivers:
37+
sqlserver:
38+
collection_interval: 1s
39+
username: sa
40+
password: ShopPass123!
41+
server: shop-dc-shim-db
42+
port: 1433
43+
resource_attributes:
44+
sqlserver.instance.name:
45+
enabled: true
46+
events:
47+
db.server.query_sample:
48+
enabled: true
49+
db.server.top_query:
50+
enabled: true
51+
service:
52+
pipelines:
53+
metrics/sqlserver:
54+
receivers:
55+
- sqlserver
56+
processors:
57+
- memory_limiter
58+
- batch
59+
- resourcedetection
60+
- resource
61+
exporters:
62+
- signalfx
63+
logs/dbmon:
64+
receivers:
65+
- sqlserver
66+
processors:
67+
- memory_limiter
68+
- batch
69+
- resourcedetection
70+
exporters:
71+
- otlphttp/dbmon

‎src/shop-dc-shim/k8s-addition.yaml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ spec:
119119
serviceAccountName: opentelemetry-demo
120120
containers:
121121
- name: shop-dc-shim
122-
image: quay.io/jeremyh/shop-dc-shim:0.0.1
122+
image: quay.io/jeremyh/shop-dc-shim:latest
123123
ports:
124124
- containerPort: 8070
125125
name: http
@@ -144,6 +144,10 @@ spec:
144144
value: "service.name=shop-dc-shim,deployment.environment=datacenter-b01,service.version=2.1.3"
145145
- name: OTEL_JAVAAGENT_ENABLED
146146
value: "true"
147+
- name: APPDYNAMICS_AGENT_ACCOUNT_ACCESS_KEY
148+
value: "${APPDYNAMICS_AGENT_ACCOUNT_ACCESS_KEY}"
149+
- name: OTEL_INSTRUMENTATION_SPLUNK_JDBC_ENABLED
150+
value: "true"
147151
resources:
148152
requests:
149153
memory: "512Mi"
@@ -155,16 +159,15 @@ spec:
155159
httpGet:
156160
path: /actuator/health
157161
port: 8070
158-
initialDelaySeconds: 360
162+
initialDelaySeconds: 360
159163
periodSeconds: 10
160164
timeoutSeconds: 5
161165
failureThreshold: 3
162-
163166
livenessProbe:
164167
httpGet:
165168
path: /actuator/health
166169
port: 8070
167-
initialDelaySeconds: 480
170+
initialDelaySeconds: 480
168171
periodSeconds: 30
169172
timeoutSeconds: 10
170173
failureThreshold: 3
@@ -219,4 +222,4 @@ spec:
219222
resources:
220223
limits:
221224
memory: "128Mi"
222-
cpu: "100m"
225+
cpu: "100m"

0 commit comments

Comments
 (0)