Skip to content

Commit 3f0d795

Browse files
authored
Merge pull request #27 from Icinga/fix/icinga2_conf_files
Fix: Icinga 2 conf files were broken
2 parents cc8c203 + 1548bb3 commit 3f0d795

6 files changed

+26
-34
lines changed

config/icinga/Invoke-IcingaCheckMSSQLBackupStatus.conf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ object CheckCommand "Invoke-IcingaCheckMSSQLBackupStatus" {
3030
}
3131
"-NoPerfData" = {
3232
set_if = "$IcingaCheckMSSQLBackupStatus_Switchparameter_NoPerfData$"
33-
set_if_format = "string"
3433
order = 99
3534
}
3635
"-SqlUsername" = {
@@ -68,7 +67,6 @@ object CheckCommand "Invoke-IcingaCheckMSSQLBackupStatus" {
6867
}
6968
"-IntegratedSecurity" = {
7069
set_if = "$IcingaCheckMSSQLBackupStatus_Switchparameter_IntegratedSecurity$"
71-
set_if_format = "string"
7270
order = 99
7371
}
7472
"-DatabaseStatusCritical" = {
@@ -112,6 +110,6 @@ object CheckCommand "Invoke-IcingaCheckMSSQLBackupStatus" {
112110
order = 16
113111
}
114112
}
115-
vars.IcingaCheckMSSQLBackupStatus_Switchparameter_NoPerfData = False
116-
vars.IcingaCheckMSSQLBackupStatus_Switchparameter_IntegratedSecurity = False
113+
vars.IcingaCheckMSSQLBackupStatus_Switchparameter_NoPerfData = false
114+
vars.IcingaCheckMSSQLBackupStatus_Switchparameter_IntegratedSecurity = false
117115
}

config/icinga/Invoke-IcingaCheckMSSQLHealth.conf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ object CheckCommand "Invoke-IcingaCheckMSSQLHealth" {
4848
}
4949
"-NoPerfData" = {
5050
set_if = "$IcingaCheckMSSQLHealth_Switchparameter_NoPerfData$"
51-
set_if_format = "string"
5251
order = 99
5352
}
5453
"-SqlHost" = {
@@ -58,10 +57,9 @@ object CheckCommand "Invoke-IcingaCheckMSSQLHealth" {
5857
}
5958
"-IntegratedSecurity" = {
6059
set_if = "$IcingaCheckMSSQLHealth_Switchparameter_IntegratedSecurity$"
61-
set_if_format = "string"
6260
order = 99
6361
}
6462
}
65-
vars.IcingaCheckMSSQLHealth_Switchparameter_NoPerfData = False
66-
vars.IcingaCheckMSSQLHealth_Switchparameter_IntegratedSecurity = False
63+
vars.IcingaCheckMSSQLHealth_Switchparameter_NoPerfData = false
64+
vars.IcingaCheckMSSQLHealth_Switchparameter_IntegratedSecurity = false
6765
}

config/icinga/Invoke-IcingaCheckMSSQLPerfCounter.conf

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,10 @@ object CheckCommand "Invoke-IcingaCheckMSSQLPerfCounter" {
4343
}
4444
"-NoPerfData" = {
4545
set_if = "$IcingaCheckMSSQLPerfCounter_Switchparameter_NoPerfData$"
46-
set_if_format = "string"
4746
order = 99
4847
}
4948
"-PerformanceCounter" = {
50-
description = "List of Performance Counters specified by their full path (example '\SQLServer:Buffer Manager\Buffer cache hit ratio') to fetch information for"
49+
description = "List of Performance Counters specified by their full path (example '\\SQLServer:Buffer Manager\\Buffer cache hit ratio') to fetch information for"
5150
value = {{
5251
var arr = macro("$IcingaCheckMSSQLPerfCounter_Array_PerformanceCounter$");
5352
if (len(arr) == 0) {
@@ -64,10 +63,9 @@ object CheckCommand "Invoke-IcingaCheckMSSQLPerfCounter" {
6463
}
6564
"-IntegratedSecurity" = {
6665
set_if = "$IcingaCheckMSSQLPerfCounter_Switchparameter_IntegratedSecurity$"
67-
set_if_format = "string"
6866
order = 99
6967
}
7068
}
71-
vars.IcingaCheckMSSQLPerfCounter_Switchparameter_NoPerfData = False
72-
vars.IcingaCheckMSSQLPerfCounter_Switchparameter_IntegratedSecurity = False
69+
vars.IcingaCheckMSSQLPerfCounter_Switchparameter_NoPerfData = false
70+
vars.IcingaCheckMSSQLPerfCounter_Switchparameter_IntegratedSecurity = false
7371
}

config/icinga/Invoke-IcingaCheckMSSQLResource.conf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ object CheckCommand "Invoke-IcingaCheckMSSQLResource" {
1414
}
1515
"-NoPerfData" = {
1616
set_if = "$IcingaCheckMSSQLResource_Switchparameter_NoPerfData$"
17-
set_if_format = "string"
1817
order = 99
1918
}
2019
"-SqlPort" = {
@@ -43,7 +42,6 @@ object CheckCommand "Invoke-IcingaCheckMSSQLResource" {
4342
}
4443
"-IntegratedSecurity" = {
4544
set_if = "$IcingaCheckMSSQLResource_Switchparameter_IntegratedSecurity$"
46-
set_if_format = "string"
4745
order = 99
4846
}
4947
"-PageLifeExpectancyCritical" = {
@@ -77,6 +75,6 @@ object CheckCommand "Invoke-IcingaCheckMSSQLResource" {
7775
order = 3
7876
}
7977
}
80-
vars.IcingaCheckMSSQLResource_Switchparameter_NoPerfData = False
81-
vars.IcingaCheckMSSQLResource_Switchparameter_IntegratedSecurity = False
78+
vars.IcingaCheckMSSQLResource_Switchparameter_NoPerfData = false
79+
vars.IcingaCheckMSSQLResource_Switchparameter_IntegratedSecurity = false
8280
}

config/icinga/Mssql_Bundle.conf

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ object CheckCommand "Invoke-IcingaCheckMSSQLHealth" {
4848
}
4949
"-NoPerfData" = {
5050
set_if = "$IcingaCheckMSSQLHealth_Switchparameter_NoPerfData$"
51-
set_if_format = "string"
5251
order = 99
5352
}
5453
"-SqlHost" = {
@@ -58,12 +57,11 @@ object CheckCommand "Invoke-IcingaCheckMSSQLHealth" {
5857
}
5958
"-IntegratedSecurity" = {
6059
set_if = "$IcingaCheckMSSQLHealth_Switchparameter_IntegratedSecurity$"
61-
set_if_format = "string"
6260
order = 99
6361
}
6462
}
65-
vars.IcingaCheckMSSQLHealth_Switchparameter_NoPerfData = False
66-
vars.IcingaCheckMSSQLHealth_Switchparameter_IntegratedSecurity = False
63+
vars.IcingaCheckMSSQLHealth_Switchparameter_NoPerfData = false
64+
vars.IcingaCheckMSSQLHealth_Switchparameter_IntegratedSecurity = false
6765
}
6866

6967
object CheckCommand "Invoke-IcingaCheckMSSQLBackupStatus" {
@@ -98,7 +96,6 @@ object CheckCommand "Invoke-IcingaCheckMSSQLBackupStatus" {
9896
}
9997
"-NoPerfData" = {
10098
set_if = "$IcingaCheckMSSQLBackupStatus_Switchparameter_NoPerfData$"
101-
set_if_format = "string"
10299
order = 99
103100
}
104101
"-SqlUsername" = {
@@ -136,7 +133,6 @@ object CheckCommand "Invoke-IcingaCheckMSSQLBackupStatus" {
136133
}
137134
"-IntegratedSecurity" = {
138135
set_if = "$IcingaCheckMSSQLBackupStatus_Switchparameter_IntegratedSecurity$"
139-
set_if_format = "string"
140136
order = 99
141137
}
142138
"-DatabaseStatusCritical" = {
@@ -180,8 +176,8 @@ object CheckCommand "Invoke-IcingaCheckMSSQLBackupStatus" {
180176
order = 16
181177
}
182178
}
183-
vars.IcingaCheckMSSQLBackupStatus_Switchparameter_NoPerfData = False
184-
vars.IcingaCheckMSSQLBackupStatus_Switchparameter_IntegratedSecurity = False
179+
vars.IcingaCheckMSSQLBackupStatus_Switchparameter_NoPerfData = false
180+
vars.IcingaCheckMSSQLBackupStatus_Switchparameter_IntegratedSecurity = false
185181
}
186182

187183
object CheckCommand "Invoke-IcingaCheckMSSQLResource" {
@@ -200,7 +196,6 @@ object CheckCommand "Invoke-IcingaCheckMSSQLResource" {
200196
}
201197
"-NoPerfData" = {
202198
set_if = "$IcingaCheckMSSQLResource_Switchparameter_NoPerfData$"
203-
set_if_format = "string"
204199
order = 99
205200
}
206201
"-SqlPort" = {
@@ -229,7 +224,6 @@ object CheckCommand "Invoke-IcingaCheckMSSQLResource" {
229224
}
230225
"-IntegratedSecurity" = {
231226
set_if = "$IcingaCheckMSSQLResource_Switchparameter_IntegratedSecurity$"
232-
set_if_format = "string"
233227
order = 99
234228
}
235229
"-PageLifeExpectancyCritical" = {
@@ -263,8 +257,8 @@ object CheckCommand "Invoke-IcingaCheckMSSQLResource" {
263257
order = 3
264258
}
265259
}
266-
vars.IcingaCheckMSSQLResource_Switchparameter_NoPerfData = False
267-
vars.IcingaCheckMSSQLResource_Switchparameter_IntegratedSecurity = False
260+
vars.IcingaCheckMSSQLResource_Switchparameter_NoPerfData = false
261+
vars.IcingaCheckMSSQLResource_Switchparameter_IntegratedSecurity = false
268262
}
269263

270264
object CheckCommand "Invoke-IcingaCheckMSSQLPerfCounter" {
@@ -312,11 +306,10 @@ object CheckCommand "Invoke-IcingaCheckMSSQLPerfCounter" {
312306
}
313307
"-NoPerfData" = {
314308
set_if = "$IcingaCheckMSSQLPerfCounter_Switchparameter_NoPerfData$"
315-
set_if_format = "string"
316309
order = 99
317310
}
318311
"-PerformanceCounter" = {
319-
description = "List of Performance Counters specified by their full path (example '\SQLServer:Buffer Manager\Buffer cache hit ratio') to fetch information for"
312+
description = "List of Performance Counters specified by their full path (example '\\SQLServer:Buffer Manager\\Buffer cache hit ratio') to fetch information for"
320313
value = {{
321314
var arr = macro("$IcingaCheckMSSQLPerfCounter_Array_PerformanceCounter$");
322315
if (len(arr) == 0) {
@@ -333,12 +326,11 @@ object CheckCommand "Invoke-IcingaCheckMSSQLPerfCounter" {
333326
}
334327
"-IntegratedSecurity" = {
335328
set_if = "$IcingaCheckMSSQLPerfCounter_Switchparameter_IntegratedSecurity$"
336-
set_if_format = "string"
337329
order = 99
338330
}
339331
}
340-
vars.IcingaCheckMSSQLPerfCounter_Switchparameter_NoPerfData = False
341-
vars.IcingaCheckMSSQLPerfCounter_Switchparameter_IntegratedSecurity = False
332+
vars.IcingaCheckMSSQLPerfCounter_Switchparameter_NoPerfData = false
333+
vars.IcingaCheckMSSQLPerfCounter_Switchparameter_IntegratedSecurity = false
342334
}
343335

344336

doc/31-Changelog.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
1111

1212
[Issue and PRs](https://github.com/Icinga/icinga-powershell-mssql/milestone/2?closed=1)
1313

14+
## 1.0.1 (2021-02-04)
15+
16+
[Issue and PRs](https://github.com/Icinga/icinga-powershell-mssql/milestone/3?closed=1)
17+
18+
### Bugfixes
19+
20+
* [27](https://github.com/Icinga/icinga-powershell-mssql/pull/27) Fixes broken Icinga 2 plain conf files
21+
1422
### Enhancements
1523

1624
* [#25](https://github.com/Icinga/icinga-powershell-mssql/pull/25) Adds Icinga 2 and Icinga Director pre-compiled configuration files and updates documentation

0 commit comments

Comments
 (0)