Skip to content

Commit b4d1fbb

Browse files
committed
Merge branch 'postmark-assets-v1.0.0' of github.com:bhargavnariyanicrest/integrations-core into postmark-assets-v1.0.0
2 parents 9b443e1 + acedf40 commit b4d1fbb

File tree

3 files changed

+82
-9
lines changed

3 files changed

+82
-9
lines changed

sqlserver/assets/configuration/spec.yaml

+47-5
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,9 @@ files:
137137
description: |
138138
Configure collection of AlwaysOn availability group metrics.
139139
140-
When the `ao_metrics.enabled` is True, use `ao_metrics.availability_group` to specify the
140+
Set `ao_metrics.enabled` to true to enable collection of AlwaysOn metrics. Defaults to false.
141+
142+
When `ao_metrics.enabled` is True, use `ao_metrics.availability_group` to specify the
141143
resource group id of a specific availability group that you would like to monitor.
142144
If no availability group is specified, then we will collect AlwaysOn metrics for all
143145
availability groups on the current replica.
@@ -163,6 +165,9 @@ files:
163165
- name: db_backup_metrics
164166
description: |
165167
Configure collection of database backup metrics.
168+
169+
Set `db_backup_metrics.enabled` to true to enable collection of database backup metrics. Defaults to true.
170+
166171
Use `db_backup_metrics.collection_interval` to set the interval (in seconds) for the collection of
167172
database backup metrics. Defaults to 300 seconds (5 minutes). If you intend on updating this value,
168173
it is strongly recommended to use a consistent value throughout all SQL Server agent deployments.
@@ -180,6 +185,8 @@ files:
180185
- name: db_files_metrics
181186
description: |
182187
Configure collection of database files metrics.
188+
189+
Set `db_files_metrics.enabled` to true to enable collection of database files metrics. Defaults to true.
183190
hidden: true
184191
value:
185192
type: object
@@ -190,6 +197,8 @@ files:
190197
- name: db_stats_metrics
191198
description: |
192199
Configure collection of database stats metrics
200+
201+
Set `db_stats_metrics.enabled` to true to enable collection of database stats metrics. Defaults to true.
193202
hidden: true
194203
value:
195204
type: object
@@ -203,6 +212,9 @@ files:
203212
Note these queries can be resource intensive on large datasets. Recommend to limit these via
204213
autodiscovery or specific database instances.
205214
215+
Set `db_fragmentation_metrics.enabled` to true to enable collection of
216+
database index fragmentation statistics. Defaults to false.
217+
206218
Use `db_fragmentation_metrics.enabled_tempdb` to enable collection of database index fragmentation statistics
207219
in tempdb database from the `sys.dm_db_index_physical_stats` DMF.
208220
By default, we do not collect index fragmentation statistics in the tempdb database, as those queries
@@ -219,7 +231,7 @@ files:
219231
- name: enabled
220232
type: boolean
221233
example: false
222-
- name: enabled_tempdb
234+
- name: enabled_tempdb
223235
type: boolean
224236
example: false
225237
- name: collection_interval
@@ -228,8 +240,11 @@ files:
228240
display_default: 300
229241
- name: fci_metrics
230242
description: |
231-
Configure collection of failover Cluster Instance metrics. Note that these metrics
243+
Configure collection of Failover Cluster Instance metrics. Note that these metrics
232244
requires a SQLServer set up with Failover Clustering enabled.
245+
246+
Set `fci_metrics.enabled` to true to enable collection of Failover Cluster Instance metrics.
247+
Defaults to false.
233248
value:
234249
type: object
235250
properties:
@@ -239,6 +254,8 @@ files:
239254
- name: file_stats_metrics
240255
description: |
241256
Configure collection of file stats metrics.
257+
258+
Set `file_stats_metrics.enabled` to true to enable collection of file stats metrics. Defaults to true.
242259
hidden: true
243260
value:
244261
type: object
@@ -252,6 +269,9 @@ files:
252269
Because the `sys.dm_db_index_usage_stats` view is scoped to the current database, enable
253270
`database_autodiscovery` or set `database`.
254271
272+
Set `index_usage_metrics.enabled` to true to enable collection of user table index usage statistics.
273+
Defaults to false.
274+
255275
Use `index_usage_metrics.enabled_tempdb` to enable collection of user table index usage statistics in tempdb
256276
database from the `sys.dm_db_index_usage_stats` DMV.
257277
By default, we do not collect index usage statistics in the tempdb database, as those queries
@@ -279,6 +299,9 @@ files:
279299
description: |
280300
Configure collection of server-level instance metrics. When setting up multiple instances for
281301
different databases on the same host these metrics will be duplicated unless this option is turned off.
302+
303+
Set `instance_metrics.enabled` to true to enable collection of server-level instance metrics.
304+
Defaults to true.
282305
value:
283306
type: object
284307
properties:
@@ -288,6 +311,9 @@ files:
288311
- name: master_files_metrics
289312
description: |
290313
Configure collection of database file size and state from `sys.master_files`
314+
315+
Set `master_files_metrics.enabled` to true to enable collection of database file size and state metrics.
316+
Defaults to false.
291317
value:
292318
type: object
293319
properties:
@@ -299,6 +325,9 @@ files:
299325
Configure collection of metrics for a log shipping setup. Required to run against the
300326
primary instance in a transaction log shipping configuration. Note that
301327
the Datadog user needs to be present in msdb and must be added to the db_datareader role.
328+
329+
Set `primary_log_shipping_metrics.enabled` to true to enable collection of primary log shipping metrics.
330+
Defaults to false.
302331
value:
303332
type: object
304333
properties:
@@ -310,6 +339,9 @@ files:
310339
Configure collection of metrics for a log shipping setup. Required to run against the
311340
secondary instance in a transaction log shipping configuration. Note that
312341
the Datadog user needs to be present in msdb and must be added to the db_datareader role.
342+
343+
Set `secondary_log_shipping_metrics.enabled` to true to enable collection of secondary log shipping metrics.
344+
Defaults to false.
313345
value:
314346
type: object
315347
properties:
@@ -319,6 +351,8 @@ files:
319351
- name: server_state_metrics
320352
description: |
321353
Configure collection of server state metrics
354+
355+
Set `server_state_metrics.enabled` to true to enable collection of server state metrics. Defaults to true.
322356
hidden: true
323357
value:
324358
type: object
@@ -329,6 +363,9 @@ files:
329363
- name: task_scheduler_metrics
330364
description: |
331365
Configure collection of additional Task and Scheduler metrics.
366+
367+
Set `task_scheduler_metrics.enabled` to true to enable collection of additional Task and Scheduler metrics.
368+
Defaults to false.
332369
value:
333370
type: object
334371
properties:
@@ -338,23 +375,28 @@ files:
338375
- name: tempdb_file_space_usage_metrics
339376
description: |
340377
Configure collection of tempdb file space usage metrics for how space is used in tempdb data files.
378+
379+
Set `tempdb_file_space_usage_metrics.enabled` to true to enable collection of
380+
tempdb file space usage metrics. Defaults to true.
341381
value:
342382
type: object
343383
properties:
344384
- name: enabled
345385
type: boolean
346-
example: false
386+
example: true
347387
- name: xe_metrics
348388
description: |
349389
Configure collection of extended events (XE) metrics.
390+
391+
Set `xe_metrics.enabled` to true to enable collection of extended events metrics. Defaults to false.
350392
value:
351393
type: object
352394
properties:
353395
- name: enabled
354396
type: boolean
355397
example: false
356398
- name: agent_jobs
357-
description: Configure collection of agent jobs events and metrics
399+
description: Configure collection of SQL Server Agent jobs events and metrics
358400
options:
359401
- name: enabled
360402
description: |

sqlserver/datadog_checks/sqlserver/config_models/instance.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ class TempdbFileSpaceUsageMetrics(BaseModel):
194194
arbitrary_types_allowed=True,
195195
frozen=True,
196196
)
197-
enabled: Optional[bool] = Field(None, examples=[False])
197+
enabled: Optional[bool] = Field(None, examples=[True])
198198

199199

200200
class XeMetrics(BaseModel):

sqlserver/datadog_checks/sqlserver/data/conf.yaml.example

+34-3
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ instances:
134134
## @param ao_metrics - mapping - optional
135135
## Configure collection of AlwaysOn availability group metrics.
136136
##
137-
## When the `ao_metrics.enabled` is True, use `ao_metrics.availability_group` to specify the
137+
## Set `ao_metrics.enabled` to true to enable collection of AlwaysOn metrics. Defaults to false.
138+
##
139+
## When `ao_metrics.enabled` is True, use `ao_metrics.availability_group` to specify the
138140
## resource group id of a specific availability group that you would like to monitor.
139141
## If no availability group is specified, then we will collect AlwaysOn metrics for all
140142
## availability groups on the current replica.
@@ -152,6 +154,9 @@ instances:
152154
## Note these queries can be resource intensive on large datasets. Recommend to limit these via
153155
## autodiscovery or specific database instances.
154156
##
157+
## Set `db_fragmentation_metrics.enabled` to true to enable collection of
158+
## database index fragmentation statistics. Defaults to false.
159+
##
155160
## Use `db_fragmentation_metrics.enabled_tempdb` to enable collection of database index fragmentation statistics
156161
## in tempdb database from the `sys.dm_db_index_physical_stats` DMF.
157162
## By default, we do not collect index fragmentation statistics in the tempdb database, as those queries
@@ -166,8 +171,11 @@ instances:
166171
# db_fragmentation_metrics: {}
167172

168173
## @param fci_metrics - mapping - optional
169-
## Configure collection of failover Cluster Instance metrics. Note that these metrics
174+
## Configure collection of Failover Cluster Instance metrics. Note that these metrics
170175
## requires a SQLServer set up with Failover Clustering enabled.
176+
##
177+
## Set `fci_metrics.enabled` to true to enable collection of Failover Cluster Instance metrics.
178+
## Defaults to false.
171179
#
172180
# fci_metrics: {}
173181

@@ -176,6 +184,9 @@ instances:
176184
## Because the `sys.dm_db_index_usage_stats` view is scoped to the current database, enable
177185
## `database_autodiscovery` or set `database`.
178186
##
187+
## Set `index_usage_metrics.enabled` to true to enable collection of user table index usage statistics.
188+
## Defaults to false.
189+
##
179190
## Use `index_usage_metrics.enabled_tempdb` to enable collection of user table index usage statistics in tempdb
180191
## database from the `sys.dm_db_index_usage_stats` DMV.
181192
## By default, we do not collect index usage statistics in the tempdb database, as those queries
@@ -192,44 +203,64 @@ instances:
192203
## @param instance_metrics - mapping - optional
193204
## Configure collection of server-level instance metrics. When setting up multiple instances for
194205
## different databases on the same host these metrics will be duplicated unless this option is turned off.
206+
##
207+
## Set `instance_metrics.enabled` to true to enable collection of server-level instance metrics.
208+
## Defaults to true.
195209
#
196210
# instance_metrics: {}
197211

198212
## @param master_files_metrics - mapping - optional
199213
## Configure collection of database file size and state from `sys.master_files`
214+
##
215+
## Set `master_files_metrics.enabled` to true to enable collection of database file size and state metrics.
216+
## Defaults to false.
200217
#
201218
# master_files_metrics: {}
202219

203220
## @param primary_log_shipping_metrics - mapping - optional
204221
## Configure collection of metrics for a log shipping setup. Required to run against the
205222
## primary instance in a transaction log shipping configuration. Note that
206223
## the Datadog user needs to be present in msdb and must be added to the db_datareader role.
224+
##
225+
## Set `primary_log_shipping_metrics.enabled` to true to enable collection of primary log shipping metrics.
226+
## Defaults to false.
207227
#
208228
# primary_log_shipping_metrics: {}
209229

210230
## @param secondary_log_shipping_metrics - mapping - optional
211231
## Configure collection of metrics for a log shipping setup. Required to run against the
212232
## secondary instance in a transaction log shipping configuration. Note that
213233
## the Datadog user needs to be present in msdb and must be added to the db_datareader role.
234+
##
235+
## Set `secondary_log_shipping_metrics.enabled` to true to enable collection of secondary log shipping metrics.
236+
## Defaults to false.
214237
#
215238
# secondary_log_shipping_metrics: {}
216239

217240
## @param task_scheduler_metrics - mapping - optional
218241
## Configure collection of additional Task and Scheduler metrics.
242+
##
243+
## Set `task_scheduler_metrics.enabled` to true to enable collection of additional Task and Scheduler metrics.
244+
## Defaults to false.
219245
#
220246
# task_scheduler_metrics: {}
221247

222248
## @param tempdb_file_space_usage_metrics - mapping - optional
223249
## Configure collection of tempdb file space usage metrics for how space is used in tempdb data files.
250+
##
251+
## Set `tempdb_file_space_usage_metrics.enabled` to true to enable collection of
252+
## tempdb file space usage metrics. Defaults to true.
224253
#
225254
# tempdb_file_space_usage_metrics: {}
226255

227256
## @param xe_metrics - mapping - optional
228257
## Configure collection of extended events (XE) metrics.
258+
##
259+
## Set `xe_metrics.enabled` to true to enable collection of extended events metrics. Defaults to false.
229260
#
230261
# xe_metrics: {}
231262

232-
## Configure collection of agent jobs events and metrics
263+
## Configure collection of SQL Server Agent jobs events and metrics
233264
#
234265
# agent_jobs:
235266

0 commit comments

Comments
 (0)