Skip to content

[8.19](backport #44890) Disable Metricbeat mssql module in FIPS builds #44906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ycombinator merged 2 commits into from
Jun 19, 2025
Merged

[8.19](backport #44890) Disable Metricbeat mssql module in FIPS builds #44906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
590ceb4
Disable Metricbeat `mssql` module in FIPS builds (#44890)
ycombinator Jun 18, 2025
e6f09e4
Running mage update
ycombinator Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions metricbeat/docs/modules/mssql.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 2 additions & 0 deletions x-pack/metricbeat/module/mssql/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
2 changes: 2 additions & 0 deletions x-pack/metricbeat/module/mssql/connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 2 additions & 0 deletions x-pack/metricbeat/module/mssql/mssql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 2 additions & 0 deletions x-pack/metricbeat/module/mssql/performance/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 2 additions & 0 deletions x-pack/metricbeat/module/mssql/performance/data_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 6 additions & 0 deletions x-pack/metricbeat/module/mssql/performance/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
16 changes: 9 additions & 7 deletions x-pack/metricbeat/module/mssql/performance/performance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/mssql/performance/performance_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -25,7 +25,7 @@
func TestFetch(t *testing.T) {
t.Skip("Skipping flaky `TestFetch` test, https://github.com/elastic/beats/issues/43123")

logp.TestingSetup()

Check failure on line 28 in x-pack/metricbeat/module/mssql/performance/performance_integration_test.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

SA1019: logp.TestingSetup is deprecated: Prefer using localized loggers. Use logptest.NewTestingLogger. (staticcheck)
service := compose.EnsureUp(t, "mssql")

f := mbtest.NewReportingMetricSetV2(t, mtest.GetConfig(service.Host(), "performance"))
Expand Down
2 changes: 2 additions & 0 deletions x-pack/metricbeat/module/mssql/testing/mssql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions x-pack/metricbeat/module/mssql/transaction_log/data_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 6 additions & 0 deletions x-pack/metricbeat/module/mssql/transaction_log/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions x-pack/metricbeat/module/mssql/transaction_log/transaction_log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/mssql/transaction_log/transaction_log_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -20,7 +20,7 @@
func TestFetch(t *testing.T) {
t.Skip("Skipping flaky `TestFetch` test, https://github.com/elastic/beats/issues/43123")

logp.TestingSetup()

Check failure on line 23 in x-pack/metricbeat/module/mssql/transaction_log/transaction_log_integration_test.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

SA1019: logp.TestingSetup is deprecated: Prefer using localized loggers. Use logptest.NewTestingLogger. (staticcheck)
service := compose.EnsureUp(t, "mssql")

f := mbtest.NewReportingMetricSetV2(t, mtest.GetConfig(service.Host(), "transaction_log"))
Expand Down
Loading