diff --git a/metricbeat/docs/modules/mssql.asciidoc b/metricbeat/docs/modules/mssql.asciidoc index e494c943d677..74d32c7fe7fc 100644 --- a/metricbeat/docs/modules/mssql.asciidoc +++ b/metricbeat/docs/modules/mssql.asciidoc @@ -10,6 +10,8 @@ This file is generated! See scripts/mage/docs_collector.go [role="xpack"] == MSSQL module +WARNING: This module is not available in FIPS-capable Metricbeat. + This is the https://www.microsoft.com/en-us/sql-server/sql-server-2017[Microsoft SQL 2017] Metricbeat module. It is still under active development to add new Metricsets and introduce enhancements. [float] diff --git a/x-pack/metricbeat/module/mssql/_meta/docs.asciidoc b/x-pack/metricbeat/module/mssql/_meta/docs.asciidoc index 43c22236c79a..27a2ee9bf9a5 100644 --- a/x-pack/metricbeat/module/mssql/_meta/docs.asciidoc +++ b/x-pack/metricbeat/module/mssql/_meta/docs.asciidoc @@ -1,3 +1,5 @@ +WARNING: This module is not available in FIPS-capable Metricbeat. + This is the https://www.microsoft.com/en-us/sql-server/sql-server-2017[Microsoft SQL 2017] Metricbeat module. It is still under active development to add new Metricsets and introduce enhancements. [float] diff --git a/x-pack/metricbeat/module/mssql/connection.go b/x-pack/metricbeat/module/mssql/connection.go index cc8b0683e5ac..ecfc90644f08 100644 --- a/x-pack/metricbeat/module/mssql/connection.go +++ b/x-pack/metricbeat/module/mssql/connection.go @@ -2,6 +2,8 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. +//go:build !requirefips + package mssql import ( diff --git a/x-pack/metricbeat/module/mssql/mssql.go b/x-pack/metricbeat/module/mssql/mssql.go index 773aab03cbea..93e184d53f7e 100644 --- a/x-pack/metricbeat/module/mssql/mssql.go +++ b/x-pack/metricbeat/module/mssql/mssql.go @@ -2,6 +2,8 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. +//go:build !requirefips + package mssql import ( diff --git a/x-pack/metricbeat/module/mssql/performance/data.go b/x-pack/metricbeat/module/mssql/performance/data.go index 4f01d17d1577..519edca00719 100644 --- a/x-pack/metricbeat/module/mssql/performance/data.go +++ b/x-pack/metricbeat/module/mssql/performance/data.go @@ -2,6 +2,8 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. +//go:build !requirefips + package performance import ( diff --git a/x-pack/metricbeat/module/mssql/performance/data_integration_test.go b/x-pack/metricbeat/module/mssql/performance/data_integration_test.go index 0e351805d80f..cf6b83d5c547 100644 --- a/x-pack/metricbeat/module/mssql/performance/data_integration_test.go +++ b/x-pack/metricbeat/module/mssql/performance/data_integration_test.go @@ -2,6 +2,8 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. +//go:build !requirefips + package performance import ( diff --git a/x-pack/metricbeat/module/mssql/performance/doc.go b/x-pack/metricbeat/module/mssql/performance/doc.go new file mode 100644 index 000000000000..abe9edb1cfe8 --- /dev/null +++ b/x-pack/metricbeat/module/mssql/performance/doc.go @@ -0,0 +1,6 @@ +// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +// or more contributor license agreements. Licensed under the Elastic License; +// you may not use this file except in compliance with the Elastic License. + +// Package performance is for the performance metricset of the mssql module. +package performance diff --git a/x-pack/metricbeat/module/mssql/performance/performance.go b/x-pack/metricbeat/module/mssql/performance/performance.go index 746b24f9029d..b7cddc461ffb 100644 --- a/x-pack/metricbeat/module/mssql/performance/performance.go +++ b/x-pack/metricbeat/module/mssql/performance/performance.go @@ -2,6 +2,8 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. +//go:build !requirefips + package performance import ( @@ -81,16 +83,16 @@ WHERE counter_name = 'SQL Compilations/sec' OR counter_name = 'Batch Requests/sec' OR ( counter_name = 'Lock Waits/sec' AND instance_name = '_Total' ) - OR ( counter_name IN ( 'Page life expectancy', - 'Buffer cache hit ratio', + OR ( counter_name IN ( 'Page life expectancy', + 'Buffer cache hit ratio', 'Buffer cache hit ratio base', - 'Target pages', 'Database pages', + 'Target pages', 'Database pages', 'Checkpoint pages/sec' ) AND object_name LIKE '%:Buffer Manager%' ) - OR ( counter_name IN ( 'Transactions', - 'Logins/sec', - 'Logouts/sec', - 'Connection Reset/sec', + OR ( counter_name IN ( 'Transactions', + 'Logins/sec', + 'Logouts/sec', + 'Connection Reset/sec', 'Active Temp Tables' ) AND object_name LIKE '%:General Statistics%' )`) if err != nil { diff --git a/x-pack/metricbeat/module/mssql/performance/performance_integration_test.go b/x-pack/metricbeat/module/mssql/performance/performance_integration_test.go index 1de4f155e4e9..e8510f335abc 100644 --- a/x-pack/metricbeat/module/mssql/performance/performance_integration_test.go +++ b/x-pack/metricbeat/module/mssql/performance/performance_integration_test.go @@ -2,7 +2,7 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. -//go:build integration +//go:build !requirefips && integration package performance diff --git a/x-pack/metricbeat/module/mssql/testing/mssql.go b/x-pack/metricbeat/module/mssql/testing/mssql.go index 68f96af796a0..85370ab84d6e 100644 --- a/x-pack/metricbeat/module/mssql/testing/mssql.go +++ b/x-pack/metricbeat/module/mssql/testing/mssql.go @@ -2,6 +2,8 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. +//go:build !requirefips + package testing import "os" diff --git a/x-pack/metricbeat/module/mssql/transaction_log/data_integration_test.go b/x-pack/metricbeat/module/mssql/transaction_log/data_integration_test.go index fcdad6ccb442..c5d2c3d9b577 100644 --- a/x-pack/metricbeat/module/mssql/transaction_log/data_integration_test.go +++ b/x-pack/metricbeat/module/mssql/transaction_log/data_integration_test.go @@ -2,6 +2,8 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. +//go:build !requirefips + package transaction_log import ( diff --git a/x-pack/metricbeat/module/mssql/transaction_log/doc.go b/x-pack/metricbeat/module/mssql/transaction_log/doc.go new file mode 100644 index 000000000000..c928d51f135e --- /dev/null +++ b/x-pack/metricbeat/module/mssql/transaction_log/doc.go @@ -0,0 +1,6 @@ +// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +// or more contributor license agreements. Licensed under the Elastic License; +// you may not use this file except in compliance with the Elastic License. + +// Package transaction_log is for the transaction_log metricset of the mssql module. +package transaction_log diff --git a/x-pack/metricbeat/module/mssql/transaction_log/transaction_log.go b/x-pack/metricbeat/module/mssql/transaction_log/transaction_log.go index 821b5db5d089..101dfe8638da 100644 --- a/x-pack/metricbeat/module/mssql/transaction_log/transaction_log.go +++ b/x-pack/metricbeat/module/mssql/transaction_log/transaction_log.go @@ -2,6 +2,8 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. +//go:build !requirefips + package transaction_log import ( diff --git a/x-pack/metricbeat/module/mssql/transaction_log/transaction_log_integration_test.go b/x-pack/metricbeat/module/mssql/transaction_log/transaction_log_integration_test.go index 667a8f91367a..85aa36c0c4a3 100644 --- a/x-pack/metricbeat/module/mssql/transaction_log/transaction_log_integration_test.go +++ b/x-pack/metricbeat/module/mssql/transaction_log/transaction_log_integration_test.go @@ -2,7 +2,7 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. -//go:build integration +//go:build !requirefips && integration package transaction_log