Counter struct field names now are strict equal to WMI names

This commit is contained in:
Поляков Игорь
2019-08-04 02:46:33 +03:00
parent 27cc1072fe
commit 4f0a3a89ab
2 changed files with 34 additions and 33 deletions

1
.gitignore vendored
View File

@@ -3,3 +3,4 @@ VERSION
*.swp *.swp
*.un~ *.un~
output/ output/
.vscode

View File

@@ -361,22 +361,22 @@ type MSSQLCollector struct {
SQLStatsUnsafeAutoParams *prometheus.Desc SQLStatsUnsafeAutoParams *prometheus.Desc
// Win32_PerfRawData_{instance}_SQLServerSQLErrors // Win32_PerfRawData_{instance}_SQLServerSQLErrors
SQLErrorsTotal *prometheus.Desc SQLErrorsTotal *prometheus.Desc
// Win32_PerfRawData_{instance}_SQLServerTransactions // Win32_PerfRawData_{instance}_SQLServerTransactions
TransactionsFreeSpaceInTempDbKB *prometheus.Desc TransactionsFreeSpaceInTempDbKB *prometheus.Desc
TransactionsLongestTransactionRunningTime *prometheus.Desc TransactionsLongestTransactionRunningTime *prometheus.Desc
TransactionsNonSnapshotVersionTotalActive *prometheus.Desc TransactionsNonSnapshotVersionTotalActive *prometheus.Desc
TransactionsSnapshotTotalActive *prometheus.Desc TransactionsSnapshotTotalActive *prometheus.Desc
TransactionsTotalActive *prometheus.Desc TransactionsTotalActive *prometheus.Desc
TransactionsUpdateConflictRatio *prometheus.Desc TransactionsUpdateConflictRatio *prometheus.Desc
TransactionsUpdateSnapshotTotalActive *prometheus.Desc TransactionsUpdateSnapshotTotalActive *prometheus.Desc
TransactionsVersionCleanupRateKBs *prometheus.Desc TransactionsVersionCleanupRateKBs *prometheus.Desc
TransactionsVersionGenerationRateKBs *prometheus.Desc TransactionsVersionGenerationRateKBs *prometheus.Desc
TransactionsVersionStoreSizeKB *prometheus.Desc TransactionsVersionStoreSizeKB *prometheus.Desc
TransactionsVersionStoreUnitCount *prometheus.Desc TransactionsVersionStoreUnitCount *prometheus.Desc
TransactionsVersionStoreUnitCreation *prometheus.Desc TransactionsVersionStoreUnitCreation *prometheus.Desc
TransactionsVersionStoreUnitTruncation *prometheus.Desc TransactionsVersionStoreUnitTruncation *prometheus.Desc
mssqlInstances mssqlInstancesType mssqlInstances mssqlInstancesType
mssqlCollectors mssqlCollectorsMap mssqlCollectors mssqlCollectorsMap
@@ -1666,7 +1666,7 @@ func NewMSSQLCollector() (Collector, error) {
), ),
// Win32_PerfRawData_{instance}_SQLServerTransactions // Win32_PerfRawData_{instance}_SQLServerTransactions
TransactionsFreeSpaceInTempDbKB: prometheus.NewDesc( TransactionsFreeSpaceInTempDbKB: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "transactions_tempdb_free_space_bytes"), prometheus.BuildFQName(Namespace, subsystem, "transactions_tempdb_free_space_bytes"),
"(Transactions.FreeSpaceInTempDbKB)", "(Transactions.FreeSpaceInTempDbKB)",
[]string{"instance"}, []string{"instance"},
@@ -3680,8 +3680,8 @@ func (c *MSSQLCollector) collectSQLStats(ch chan<- prometheus.Metric, sqlInstanc
} }
type win32PerfRawDataSQLServerSQLErrors struct { type win32PerfRawDataSQLServerSQLErrors struct {
Name string Name string
Errorssec uint64 ErrorsPersec uint64
} }
// Win32_PerfRawData_MSSQLSERVER_SQLServerErrors docs: // Win32_PerfRawData_MSSQLSERVER_SQLServerErrors docs:
@@ -3702,7 +3702,7 @@ func (c *MSSQLCollector) collectSQLErrors(ch chan<- prometheus.Metric, sqlInstan
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.SQLErrorsTotal, c.SQLErrorsTotal,
prometheus.CounterValue, prometheus.CounterValue,
float64(v.Errorssec), float64(v.ErrorsPersec),
sqlInstance, resource, sqlInstance, resource,
) )
} }
@@ -3711,19 +3711,19 @@ func (c *MSSQLCollector) collectSQLErrors(ch chan<- prometheus.Metric, sqlInstan
} }
type win32PerfRawDataSqlServerTransactions struct { type win32PerfRawDataSqlServerTransactions struct {
FreeSpaceInTempDbKB uint64 FreeSpaceintempdbKB uint64
LongestTransactionRunningTime uint64 LongestTransactionRunningTime uint64
NonSnapshotVersionTransactions uint64 NonSnapshotVersionTransactions uint64
SnapshotTransactions uint64 SnapshotTransactions uint64
Transactions uint64 Transactions uint64
UpdateConflictRatio uint64 Updateconflictratio uint64
UpdateSnapshotTransactions uint64 UpdateSnapshotTransactions uint64
VersionCleanupRateKBs uint64 VersionCleanuprateKBPers uint64
VersionGenerationRateKBs uint64 VersionGenerationrateKBPers uint64
VersionStoreSizeKB uint64 VersionStoreSizeKB uint64
VersionStoreUnitCount uint64 VersionStoreunitcount uint64
VersionStoreUnitCreation uint64 VersionStoreunitcreation uint64
VersionStoreUnitTruncation uint64 VersionStoreunittruncation uint64
} }
// Win32_PerfRawData_MSSQLSERVER_Transactions docs: // Win32_PerfRawData_MSSQLSERVER_Transactions docs:
@@ -3747,7 +3747,7 @@ func (c *MSSQLCollector) collectTransactions(ch chan<- prometheus.Metric, sqlIns
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.TransactionsFreeSpaceInTempDbKB, c.TransactionsFreeSpaceInTempDbKB,
prometheus.GaugeValue, prometheus.GaugeValue,
float64(v.FreeSpaceInTempDbKB), float64(v.FreeSpaceintempdbKB),
sqlInstance, sqlInstance,
) )
@@ -3782,7 +3782,7 @@ func (c *MSSQLCollector) collectTransactions(ch chan<- prometheus.Metric, sqlIns
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.TransactionsUpdateConflictRatio, c.TransactionsUpdateConflictRatio,
prometheus.GaugeValue, prometheus.GaugeValue,
float64(v.UpdateConflictRatio), float64(v.Updateconflictratio),
sqlInstance, sqlInstance,
) )
@@ -3796,14 +3796,14 @@ func (c *MSSQLCollector) collectTransactions(ch chan<- prometheus.Metric, sqlIns
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.TransactionsVersionCleanupRateKBs, c.TransactionsVersionCleanupRateKBs,
prometheus.GaugeValue, prometheus.GaugeValue,
float64(v.VersionCleanupRateKBs), float64(v.VersionCleanuprateKBPers),
sqlInstance, sqlInstance,
) )
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.TransactionsVersionGenerationRateKBs, c.TransactionsVersionGenerationRateKBs,
prometheus.GaugeValue, prometheus.GaugeValue,
float64(v.VersionGenerationRateKBs), float64(v.VersionGenerationrateKBPers),
sqlInstance, sqlInstance,
) )
@@ -3817,21 +3817,21 @@ func (c *MSSQLCollector) collectTransactions(ch chan<- prometheus.Metric, sqlIns
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.TransactionsVersionStoreUnitCount, c.TransactionsVersionStoreUnitCount,
prometheus.CounterValue, prometheus.CounterValue,
float64(v.VersionStoreUnitCount), float64(v.VersionStoreunitcount),
sqlInstance, sqlInstance,
) )
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.TransactionsVersionStoreUnitCreation, c.TransactionsVersionStoreUnitCreation,
prometheus.CounterValue, prometheus.CounterValue,
float64(v.VersionStoreUnitCreation), float64(v.VersionStoreunitcreation),
sqlInstance, sqlInstance,
) )
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.TransactionsVersionStoreUnitTruncation, c.TransactionsVersionStoreUnitTruncation,
prometheus.CounterValue, prometheus.CounterValue,
float64(v.VersionStoreUnitTruncation), float64(v.VersionStoreunittruncation),
sqlInstance, sqlInstance,
) )