Simple Monitor の修正

Simple Monitor/02.データアクセス状況の取得.sql

@@ -1,8 +1,14 @@
 SET NOCOUNT ON
 
 -- データアクセス状況の取得
-DROP TABLE IF EXISTS #T1
-DROP TABLE IF EXISTS #T2
+-- DROP TABLE IF EXISTS #T1
+-- DROP TABLE IF EXISTS #T2
+
+IF (OBJECT_ID('tempdb..#T1') IS NOT NULL)
+	DROP TABLE #T1
+IF (OBJECT_ID('tempdb..#T2') IS NOT NULL)
+	DROP TABLE #T2
+
 
 SELECT
 	GETDATE() counter_date,

Simple Monitor/03.トランザクションログの書き込み性能の取得.sql

@@ -1,8 +1,12 @@
 SET NOCOUNT ON
 
 -- トランザクションログの書き込み状況
-DROP TABLE IF EXISTS #T1
-DROP TABLE IF EXISTS #T2
+-- DROP TABLE IF EXISTS #T1
+-- DROP TABLE IF EXISTS #T2
+IF (OBJECT_ID('tempdb..#T1') IS NOT NULL)
+	DROP TABLE #T1
+IF (OBJECT_ID('tempdb..#T2') IS NOT NULL)
+	DROP TABLE #T2
 
 SELECT
 	GETDATE() counter_date, 

Simple Monitor/07.待ち事象の情報の取得.sql

@@ -1,32 +1,67 @@
 SET NOCOUNT ON
-
-SELECT
-	GETDATE() as counter_date,
-	counter_name,
-	[Average wait time (ms)],
-	[Waits in progress],
-	[Waits started per second],
-	[Cumulative wait time (ms) per second]
-FROM
-	(
+IF (SERVERPROPERTY('ProductMajorVersion') IS NOT NULL)
+BEGIN
 	SELECT
-		RTRIM(instance_name) AS instance_name,
-		RTRIM(counter_name) AS counter_name,
-		cntr_value
-	FROM 
-		sys.dm_os_performance_counters
-	WHERE 
-		object_name like '%Wait Statistics%'
-	) AS T
-PIVOT
-(
-	SUM(cntr_value)
-	FOR instance_name 
-	IN( 
+		GETDATE() as counter_date,
+		counter_name,
 		[Average wait time (ms)],
 		[Waits in progress],
 		[Waits started per second],
 		[Cumulative wait time (ms) per second]
-	)
-) AS PVT
-ORDER BY counter_name
+	FROM
+		(
+		SELECT
+			RTRIM(instance_name) AS instance_name,
+			RTRIM(counter_name) AS counter_name,
+			cntr_value
+		FROM 
+			sys.dm_os_performance_counters
+		WHERE 
+			object_name like '%Wait Statistics%'
+		) AS T
+	PIVOT
+	(
+		SUM(cntr_value)
+		FOR instance_name 
+		IN( 
+			[Average wait time (ms)],
+			[Waits in progress],
+			[Waits started per second],
+			[Cumulative wait time (ms) per second]
+		)
+	) AS PVT
+	ORDER BY counter_name
+END
+ELSE
+BEGIN
+	SELECT
+		GETDATE() as counter_date,
+		counter_name,
+		[平均待機時間 (ミリ秒)] AS [Average wait time (ms)],
+		[待機中] AS [Waits in progress],
+		[1 秒あたりに開始された待機回数] AS [Waits started per second],
+		[1 秒あたりの累積待機時間 (ミリ秒)] AS [Cumulative wait time (ms) per second]
+	FROM
+		(
+		SELECT
+			RTRIM(instance_name) AS instance_name,
+			RTRIM(counter_name) AS counter_name,
+			cntr_value
+		FROM 
+			sys.dm_os_performance_counters
+		WHERE 
+			object_name like '%Wait Statistics%'
+		) AS T
+	PIVOT
+	(
+		SUM(cntr_value)
+		FOR instance_name 
+		IN( 
+			[平均待機時間 (ミリ秒)],
+			[待機中],
+			[1 秒あたりに開始された待機回数],
+			[1 秒あたりの累積待機時間 (ミリ秒)]
+		)
+	) AS PVT
+	ORDER BY counter_name
+END

Simple Monitor/08.ファイル IO の取得_Box.sql

@@ -1,8 +1,12 @@
 SET NOCOUNT ON
 
 -- ファイル I/O の取得
-DROP TABLE IF EXISTS #T1
-DROP TABLE IF EXISTS #T2
+-- DROP TABLE IF EXISTS #T1
+-- DROP TABLE IF EXISTS #T2
+IF (OBJECT_ID('tempdb..#T1') IS NOT NULL)
+	DROP TABLE #T1
+IF (OBJECT_ID('tempdb..#T2') IS NOT NULL)
+	DROP TABLE #T2
 
 SELECT
 	GETDATE() AS counter_date,

Simple Monitor/10.DMV の待ち事象の情報の取得_Box.sql

@@ -1,5 +1,10 @@
-DROP TABLE IF EXISTS #T1
-DROP TABLE IF EXISTS #T2
+-- DROP TABLE IF EXISTS #T1
+-- DROP TABLE IF EXISTS #T2
+IF (OBJECT_ID('tempdb..#T1') IS NOT NULL)
+	DROP TABLE #T1
+IF (OBJECT_ID('tempdb..#T2') IS NOT NULL)
+	DROP TABLE #T2
+
 
 SELECT
 	GETDATE() AS counter_date,

Simple Monitor/11.可用性グループの複製情報の取得.sql

@@ -1,5 +1,9 @@
-DROP TABLE IF EXISTS #T1
-DROP TABLE IF EXISTS #T2
+-- DROP TABLE IF EXISTS #T1
+-- DROP TABLE IF EXISTS #T2
+IF (OBJECT_ID('tempdb..#T1') IS NOT NULL)
+	DROP TABLE #T1
+IF (OBJECT_ID('tempdb..#T2') IS NOT NULL)
+	DROP TABLE #T2
 
 SELECT 
 	GETDATE() AS counter_date,

Simple Monitor/Simple Monitor.ps1

@@ -1,10 +1,10 @@
 [CmdletBinding()]
 param(
-    $server = "",
+    $server = "localhost",
     $user = "",
     $password = "",
     $outputdir = "C:\Simple Monitor",
-    $database = "",
+    $database = "master",
     $interval = 5,
     $isAzure = $false,
     $isPDW = $false
@@ -16,7 +16,7 @@ Clear-Host
 Write-Output "Press Ctrl+C to exit."
 
 # PS1 と同じディレクトリ内の SQL ファイルを実行する
-# Box と SQL Database でし応するクエリが異なる場合、Box or Azure のファイル名で使い分ける
+# Box と SQL Database で使用するクエリが異なる場合、Box or Azure のファイル名で使い分ける
 if ($isPDW){
     $sqllist = Get-ChildItem -Path (Split-Path $MyInvocation.MyCommand.Path -Parent) | ? Name -Match "^[0-9].*sql" | ? Name -Like "*PDW*"
 }elseif($isAzure){
@@ -50,7 +50,7 @@ while($true){
             # PBI Desktop でオリジナルのファイルを読み込むと、ファイルロックしてしまうことがあるので、二次ディレクトリに退避し、PBI Desktop ではそちらにアクセス
             Copy-Item (Join-Path $outfilepath $outfile) (Join-Path $outputdir "Results") -Force
         }catch{
-            Write-Host ("{0}:{1}"-f (Get-Date),$Error[0].Exception.Message)
+            Write-Host ("{0}:[{1}]:{2}"-f (Get-Date), $sqlfile, $Error[0].Exception.Message)
         }
     }