Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit e1abbce

Browse files
Checking code - Grafana - SqlServer - Working for Default/Named instances
Checking code - Grafana - SqlServer - Working for Default/Named instances
1 parent e21187e commit e1abbce

File tree

6 files changed

+52
-29
lines changed

6 files changed

+52
-29
lines changed

‎.vs/SQLDBA-SSMS Solution/v15/.ssms_suo

1 KB
Binary file not shown.

‎Baselining/Baselining.ssmssqlproj

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,18 @@
3939
<ConnectionProtocol>NotSpecified</ConnectionProtocol>
4040
<ApplicationName>Microsoft SQL Server Management Studio - Query</ApplicationName>
4141
</ConnectionNode>
42+
<ConnectionNode Name="SQL-A\V17:sa">
43+
<Created>2020年09月16日T15:13:03.0844296+05:30</Created>
44+
<Type>SQL</Type>
45+
<Server>SQL-A\V17</Server>
46+
<UserName>sa</UserName>
47+
<Authentication>SQL</Authentication>
48+
<InitialDB />
49+
<LoginTimeout>30</LoginTimeout>
50+
<ExecutionTimeout>0</ExecutionTimeout>
51+
<ConnectionProtocol>NotSpecified</ConnectionProtocol>
52+
<ApplicationName>Microsoft SQL Server Management Studio - Query</ApplicationName>
53+
</ConnectionNode>
4254
</Items>
4355
</LogicalFolder>
4456
<LogicalFolder Name="Queries" Type="0" Sorted="true">
@@ -145,12 +157,6 @@
145157
<AssociatedConnUserName />
146158
<FullPath>Job [DBA - FirstResponderKit_Collect_PerformanceData].sql</FullPath>
147159
</FileNode>
148-
<FileNode Name="Job [DBA - Log_With_sp_WhoIsActive].sql">
149-
<AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:SQL-A:False:sa</AssociatedConnectionMoniker>
150-
<AssociatedConnSrvName>SQL-A</AssociatedConnSrvName>
151-
<AssociatedConnUserName>sa</AssociatedConnUserName>
152-
<FullPath>Job [DBA - Log_With_sp_WhoIsActive].sql</FullPath>
153-
</FileNode>
154160
<FileNode Name="Optimize [DBA] database.sql">
155161
<AssociatedConnectionMoniker />
156162
<AssociatedConnSrvName />
@@ -175,6 +181,12 @@
175181
<AssociatedConnUserName />
176182
<FullPath>SCH-ExtendedEvents-Queries.sql</FullPath>
177183
</FileNode>
184+
<FileNode Name="SCH-Job-[(dba) Collect Metrics - WhoIsActive].sql">
185+
<AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:(local):True</AssociatedConnectionMoniker>
186+
<AssociatedConnSrvName>(local)</AssociatedConnSrvName>
187+
<AssociatedConnUserName />
188+
<FullPath>SCH-Job-[(dba) Collect Metrics - WhoIsActive].sql</FullPath>
189+
</FileNode>
178190
<FileNode Name="SELECT permission to All Users.sql">
179191
<AssociatedConnectionMoniker />
180192
<AssociatedConnSrvName />

‎Baselining/Job [DBA - Log_With_sp_WhoIsActive].sql renamed to ‎Baselining/SCH-Job-[(dba) Collect Metrics - WhoIsActive].sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ BEGIN
5050
CREATE NONCLUSTERED INDEX [nci_WhoIsActive_blockings] ON [dbo].[WhoIsActive]
5151
( blocking_session_id, blocked_session_count, [collection_time] ASC, session_id)
5252
INCLUDE (login_name, [host_name], [database_name], [program_name])
53+
--ON [fg_nci]
5354
END
5455
GO
5556

‎BlitzQueries/BlitzQueries.ssmssqlproj

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,18 @@
3939
<ConnectionProtocol>NotSpecified</ConnectionProtocol>
4040
<ApplicationName>Microsoft SQL Server Management Studio - Query</ApplicationName>
4141
</ConnectionNode>
42+
<ConnectionNode Name="SQL-A\V17:sa">
43+
<Created>2020年09月16日T15:11:41.0890883+05:30</Created>
44+
<Type>SQL</Type>
45+
<Server>SQL-A\V17</Server>
46+
<UserName>sa</UserName>
47+
<Authentication>SQL</Authentication>
48+
<InitialDB />
49+
<LoginTimeout>30</LoginTimeout>
50+
<ExecutionTimeout>0</ExecutionTimeout>
51+
<ConnectionProtocol>NotSpecified</ConnectionProtocol>
52+
<ApplicationName>Microsoft SQL Server Management Studio - Query</ApplicationName>
53+
</ConnectionNode>
4254
</Items>
4355
</LogicalFolder>
4456
<LogicalFolder Name="Queries" Type="0" Sorted="true">
@@ -206,8 +218,8 @@
206218
<FullPath>WhatIsRunning.sql</FullPath>
207219
</FileNode>
208220
<FileNode Name="who_is_active_v11_32(Modified).sql">
209-
<AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:SQL-A:False:sa</AssociatedConnectionMoniker>
210-
<AssociatedConnSrvName>SQL-A</AssociatedConnSrvName>
221+
<AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:SQL-A\V17:False:sa</AssociatedConnectionMoniker>
222+
<AssociatedConnSrvName>SQL-A\V17</AssociatedConnSrvName>
211223
<AssociatedConnUserName>sa</AssociatedConnUserName>
212224
<FullPath>who_is_active_v11_32(Modified).sql</FullPath>
213225
</FileNode>

‎SQLDBATools-Inventory/SCH-DBA-database.sql

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ go
33

44
CREATE DATABASE DBA
55
-- ON PRIMARY
6-
--( NAME = N'DBA', FILENAME = N'E:\MSSQL15.MSSQLSERVER\Data\DBA.mdf' , SIZE = 500MB , FILEGROWTH = 200MB )
6+
--( NAME = N'DBA', FILENAME = N'E:\MSSQL14.V17\Data\DBA.mdf' , SIZE = 500MB , FILEGROWTH = 200MB )
77
-- LOG ON
8-
--( NAME = N'DBA_log', FILENAME = N'E:\MSSQL15.MSSQLSERVER\Log\DBA_log.ldf' , SIZE = 500MB , FILEGROWTH = 200MB )
8+
--( NAME = N'DBA_log', FILENAME = N'E:\MSSQL14.V17\Log\DBA_log.ldf' , SIZE = 500MB , FILEGROWTH = 200MB )
99
GO
1010

1111
ALTER DATABASE DBA ADD FILEGROUP [fg_default]
1212
GO
1313
ALTER DATABASE DBA ADD FILE
14-
( NAME = N'DBA_fg_default', FILENAME = N'E:\MSSQL15.MSSQLSERVER\Data\DBA_fg_default.ndf' , SIZE = 500MB , FILEGROWTH = 500MB )
14+
( NAME = N'DBA_fg_default', FILENAME = N'E:\MSSQL14.V17\Data\DBA_fg_default.ndf' , SIZE = 500MB , FILEGROWTH = 500MB )
1515
TO FILEGROUP [fg_default]
1616
GO
1717
ALTER DATABASE DBA MODIFY FILEGROUP [fg_default] DEFAULT
@@ -20,35 +20,35 @@ GO
2020
ALTER DATABASE DBA ADD FILEGROUP [fg_ci]
2121
GO
2222
ALTER DATABASE DBA ADD FILE
23-
( NAME = N'DBA_1_fg_ci', FILENAME = N'E:\MSSQL15.MSSQLSERVER\Data\DBA_1_fg_ci.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB ),
24-
( NAME = N'DBA_2_fg_ci', FILENAME = N'E:\MSSQL15.MSSQLSERVER\Data\DBA_2_fg_ci.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB ),
25-
( NAME = N'DBA_3_fg_ci', FILENAME = N'E:\MSSQL15.MSSQLSERVER\Data\DBA_3_fg_ci.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB ),
26-
( NAME = N'DBA_4_fg_ci', FILENAME = N'E:\MSSQL15.MSSQLSERVER\Data\DBA_4_fg_ci.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB )
23+
( NAME = N'DBA_1_fg_ci', FILENAME = N'E:\MSSQL14.V17\Data\DBA_1_fg_ci.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB ),
24+
( NAME = N'DBA_2_fg_ci', FILENAME = N'E:\MSSQL14.V17\Data\DBA_2_fg_ci.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB ),
25+
( NAME = N'DBA_3_fg_ci', FILENAME = N'E:\MSSQL14.V17\Data\DBA_3_fg_ci.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB ),
26+
( NAME = N'DBA_4_fg_ci', FILENAME = N'E:\MSSQL14.V17\Data\DBA_4_fg_ci.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB )
2727
TO FILEGROUP [fg_ci]
2828
GO
2929

3030
ALTER DATABASE DBA ADD FILEGROUP [fg_nci]
3131
GO
3232
ALTER DATABASE DBA ADD FILE
33-
( NAME = N'DBA_1_fg_nci', FILENAME = N'E:\MSSQL15.MSSQLSERVER\Data\DBA_1_fg_nci.ndf' , SIZE = 204800KB , FILEGROWTH = 204800KB ),
34-
( NAME = N'DBA_2_fg_nci', FILENAME = N'E:\MSSQL15.MSSQLSERVER\Data\DBA_2_fg_nci.ndf' , SIZE = 204800KB , FILEGROWTH = 204800KB )
33+
( NAME = N'DBA_1_fg_nci', FILENAME = N'E:\MSSQL14.V17\Data\DBA_1_fg_nci.ndf' , SIZE = 204800KB , FILEGROWTH = 204800KB ),
34+
( NAME = N'DBA_2_fg_nci', FILENAME = N'E:\MSSQL14.V17\Data\DBA_2_fg_nci.ndf' , SIZE = 204800KB , FILEGROWTH = 204800KB )
3535
TO FILEGROUP [fg_nci]
3636
GO
3737

3838
ALTER DATABASE DBA ADD FILEGROUP [fg_heap]
3939
GO
4040
ALTER DATABASE DBA ADD FILE
41-
( NAME = N'DBA_1_fg_heap', FILENAME = N'E:\MSSQL15.MSSQLSERVER\Data\DBA_1_fg_heap.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB )
41+
( NAME = N'DBA_1_fg_heap', FILENAME = N'E:\MSSQL14.V17\Data\DBA_1_fg_heap.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB )
4242
TO FILEGROUP [fg_heap]
4343
GO
4444

4545
ALTER DATABASE DBA ADD FILEGROUP [fg_archive]
4646
GO
4747
ALTER DATABASE DBA ADD FILE
48-
( NAME = N'DBA_1_fg_archive', FILENAME = N'E:\MSSQL15.MSSQLSERVER\Data\DBA_1_fg_archive.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB ),
49-
( NAME = N'DBA_2_fg_archive', FILENAME = N'E:\MSSQL15.MSSQLSERVER\Data\DBA_2_fg_archive.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB ),
50-
( NAME = N'DBA_3_fg_archive', FILENAME = N'E:\MSSQL15.MSSQLSERVER\Data\DBA_3_fg_archive.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB ),
51-
( NAME = N'DBA_4_fg_archive', FILENAME = N'E:\MSSQL15.MSSQLSERVER\Data\DBA_4_fg_archive.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB )
48+
( NAME = N'DBA_1_fg_archive', FILENAME = N'E:\MSSQL14.V17\Data\DBA_1_fg_archive.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB ),
49+
( NAME = N'DBA_2_fg_archive', FILENAME = N'E:\MSSQL14.V17\Data\DBA_2_fg_archive.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB ),
50+
( NAME = N'DBA_3_fg_archive', FILENAME = N'E:\MSSQL14.V17\Data\DBA_3_fg_archive.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB ),
51+
( NAME = N'DBA_4_fg_archive', FILENAME = N'E:\MSSQL14.V17\Data\DBA_4_fg_archive.ndf' , SIZE = 512000KB , FILEGROWTH = 512000KB )
5252
TO FILEGROUP [fg_archive]
5353
GO
5454

‎SQLDBATools-Inventory/SCH-usp_collect_performance_metrics.sql

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,7 @@ ALTER TABLE dbo.dm_os_performance_counters_aggregated_1year
501501
WITH ( FILLFACTOR = 90, SORT_IN_TEMPDB = ON ) ON [fg_archive]
502502
GO
503503
504+
-- drop view dbo.dm_os_performance_counters_aggregated
504505
create view dbo.dm_os_performance_counters_aggregated
505506
with schemabinding
506507
as
@@ -822,16 +823,13 @@ go
822823
select @@SERVERNAME
823824
go
824825
825-
if object_id('dbo.dm_os_performance_counters_aggregated') is not null
826-
drop view dbo.dm_os_performance_counters_aggregated;
826+
if object_id('dbo.dm_os_performance_counters_nonsql') is not null
827+
drop table dbo.dm_os_performance_counters_nonsql;
827828
go
828-
create view dbo.dm_os_performance_counters_aggregated
829+
create view dbo.dm_os_performance_counters_nonsql
829830
as
830831
select [collection_time], [server_name], [object_name], [counter_name], [instance_name], [cntr_value], [cntr_type], [id]
831-
from [SQL-A].[DBA].[dbo].[dm_os_performance_counters_aggregated_90days]
832-
union all
833-
select [collection_time], [server_name], [object_name], [counter_name], [instance_name], [cntr_value], [cntr_type], [id]
834-
from [SQL-A].[DBA].[dbo].[dm_os_performance_counters_aggregated_1year]
832+
from [SQL-A].[DBA].[dbo].[dm_os_performance_counters_nonsql]
835833
go
836834
837835
if object_id('dbo.dm_os_performance_counters_nonsql_aggregated') is not null

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /