Atomic commit

elastic · Jan 23, 2019 · bd5b623 · bd5b623
1 parent bb535f9
commit bd5b623
Show file tree

Hide file tree

Showing 23 changed files with 384 additions and 342 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -207,6 +207,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Release http.server metricset as GA. {pull}10240[10240]
 - Making RabbitMQ Metricbeat module GA. {pull}10165[10165]
 - Release use of xpack.enabled: true flag in Elasticsearch and Kibana modules as GA. {pull}10222[10222]
+- Rename 'db' Metricset to 'transaction_log' in MSSQL Metricbeat module {pull}10109[10109]
 
 *Packetbeat*
 

diff --git a/x-pack/metricbeat/include/list.go b/x-pack/metricbeat/include/list.go
diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml
@@ -507,7 +507,7 @@ metricbeat.modules:
 #-------------------------------- Mssql Module --------------------------------
 - module: mssql
   metricsets:
-    - "db"
+    - "transaction_log"
     - "performance"
   hosts: ["sqlserver://sa@localhost"]
   period: 10s

diff --git a/x-pack/metricbeat/module/mssql/_meta/config.yml b/x-pack/metricbeat/module/mssql/_meta/config.yml
@@ -1,6 +1,6 @@
 - module: mssql
   metricsets:
-    - "db"
+    - "transaction_log"
     - "performance"
   hosts: ["sqlserver://sa@localhost"]
   period: 10s

diff --git a/x-pack/metricbeat/module/mssql/_meta/docs.asciidoc b/x-pack/metricbeat/module/mssql/_meta/docs.asciidoc
@@ -8,8 +8,12 @@ The module is being tested with https://hub.docker.com/r/microsoft/mssql-server-
 [float]
 == Metricsets
 
-The following Metricset is already included:
+The following Metricsets are already included:
 
-=== `db`
+=== `transaction_log`
 
-`db` Metricset fetches a set of values from https://docs.microsoft.com/en-us/sql/relational-databases/system-dynamic-management-views/sys-dm-db-log-space-usage-transact-sql?view=sql-server-2017[log space usage] which returns space usage information for the transaction log for each different database.
+`transaction_log` Metricset fetches information about the operation and transaction log of each MSSQL database in the monitored instance. All data is extracted from the https://docs.microsoft.com/en-us/sql/relational-databases/system-dynamic-management-views/database-related-dynamic-management-views-transact-sql?view=sql-server-2017[Database Dynamic Management Views]
+
+=== `performance`
+
+`performance` Metricset fetches information from what's commonly known as https://docs.microsoft.com/en-us/sql/relational-databases/system-dynamic-management-views/sys-dm-os-performance-counters-transact-sql?view=sql-server-2017[Performance Counters] in MSSQL.
diff --git a/x-pack/metricbeat/module/mssql/_meta/fields.yml b/x-pack/metricbeat/module/mssql/_meta/fields.yml
@@ -7,3 +7,13 @@
       type: group
       description: >
       fields:
+        - name: database
+          type: group
+          description: The database that the metrics is being referred to
+          fields:
+            - name: id
+              type: long
+              description: Unique ID of the database inside MSSQL
+            - name: name
+              type: keyword
+              description: Name of the database
diff --git a/x-pack/metricbeat/module/mssql/connection.go b/x-pack/metricbeat/module/mssql/connection.go
@@ -7,6 +7,9 @@ package mssql
 import (
 	"database/sql"
 
+	// Register driver.
+	_ "github.com/denisenkom/go-mssqldb"
+
 	"github.com/pkg/errors"
 )
 

diff --git a/x-pack/metricbeat/module/mssql/db/_meta/data.json b/x-pack/metricbeat/module/mssql/db/_meta/data.json
diff --git a/x-pack/metricbeat/module/mssql/db/_meta/docs.asciidoc b/x-pack/metricbeat/module/mssql/db/_meta/docs.asciidoc
diff --git a/x-pack/metricbeat/module/mssql/db/_meta/fields.yml b/x-pack/metricbeat/module/mssql/db/_meta/fields.yml
diff --git a/x-pack/metricbeat/module/mssql/db/data.go b/x-pack/metricbeat/module/mssql/db/data.go
diff --git a/x-pack/metricbeat/module/mssql/db/db.go b/x-pack/metricbeat/module/mssql/db/db.go