Meik/C4IT-F4SD-Collector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare Data History Provider 2.7 integration update

Browse Source 
- modularize Citrix and agent integrations and add remote desktop endpoints
- extend ticket overview, ticket links, token validation, and staged relation handling
- update configuration, licensing, project, signing, and publish artifacts
This commit is contained in:
Meik
2026-07-20 09:31:52 +02:00
parent a3357e2a36
commit ccc48c521a
62 changed files with 5267 additions and 2521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
C4IT_DataHistoryProvider_Test/DataHistorySql.xml
View File

@@ -723,6 +723,22 @@
SELECT @cnt
</Query>
<!--<Query Name="UpdateDbTablesV1.10"/> used in the past and removed-->
<Query Name="UpdateDbTablesV1.11">
DECLARE @cnt INT
SET @cnt = 0
IF EXISTS(SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N&apos;[main-user-tokens]&apos;) AND type in (N&apos;U&apos;))
AND NOT EXISTS (SELECT * FROM Information_Schema.Columns WHERE Table_Name = &apos;main-user-tokens&apos; AND Column_Name = &apos;id_remote&apos;)
BEGIN
PRINT N&apos;Start adding column [id_remote] to table [main-user-tokens] ...&apos;;
ALTER Table [main-user-tokens] ADD [id_remote] NVARCHAR(64) NULL;
SET @cnt = @cnt + 1;
PRINT N&apos;... done.&apos;
END
SELECT @cnt
</Query>
<Query Name="UpdateDbVersion">
IF NOT EXISTS (SELECT 1 FROM [main-db-version] WHERE [db_version] = @version AND [db_revision] = @revision)
INSERT INTO [main-db-version] ([db_version], [db_revision]) VALUES (@version,@revision);
@@ -931,10 +947,24 @@
<Query Name="UpdateComputerIntune">
UPDATE [main-computer] SET [id_intune]=@id WHERE [deviceId_azure]=@deviceId
</Query>
<Query Name="UpdateComputerIntune2">
<Query Name="UpdateComputerIntune2">
UPDATE [main-computer] SET [id_intune]=@id, [deviceid_azure]=@deviceid, tenant_azure = @tenant WHERE upn_internal = @upn_internal and [domainNB] is null
</Query>
<Query Name="UpdateUserCitrix">
<Query Name="GetUserBySidOrUpn">
DECLARE @ID UNIQUEIDENTIFIER
SET @ID = (SELECT id FROM [main-user] WHERE [sid_bin] = @SID)
IF (@ID is null) SET @ID = (SELECT id FROM [main-user] WHERE [upn_external] = @UPN)
SELECT @ID
</Query>
<Query Name="GetForeignUserInfo">
SELECT [id],[origin],[instance],[id_foreign] FROM [main-user-foreign-ids] WHERE [ID] = @ID
</Query>
<Query Name="UpdateForeignUsernfo">
UPDATE [main-user-foreign-ids] SET [id] = @ID WHERE [origin] = @origin and [instance] = @instance and [id_foreign] = @id_foreign
IF @@ROWCOUNT = 0
INSERT INTO [main-user-foreign-ids] ([id], [origin], [instance], [id_foreign]) VALUES (@id, @origin, @instance, @id_foreign)
</Query>
<Query Name="UpdateUserCitrix">
UPDATE [main-user] SET [id_citrix]=@id WHERE [sid_bin]=@sid_bin
</Query>
<Query Name="UpdateUserCitrix2">
@@ -2526,14 +2556,14 @@
SELECT [Key],[Value] FROM [main-config]
</Query>
<Query Name="GetAllExternalTokens">
SELECT [id],[type],[name],[name2],[secret],[validUntil],[renewUntil] FROM [main-user-tokens]
SELECT [id],[type],[name],[name2],[secret],[validUntil],[renewUntil],[id_remote] FROM [main-user-tokens]
</Query>
<Query Name="RemoveExpieredExternalTokens">
DELETE FROM [main-user-tokens] WHERE [validUntil] &lt; @ValidUntil
</Query>
<Query Name="InsertOrUpdateExternalToken">
UPDATE [main-user-tokens] SET [name]=@Name, [name2]=@Name2, [secret]=@Secret, [validUntil]=@ValidUntil, [renewUntil]=@RenewUntil WHERE [id]=@Id AND [type]=@Type
IF @@ROWCOUNT = 0 INSERT INTO [main-user-tokens] ([id], [type], [name], [name2], [secret], [validUntil], [renewUntil]) VALUES (@Id, @Type, @Name, @Name2, @Secret, @ValidUntil, @RenewUntil)
UPDATE [main-user-tokens] SET [name]=@Name, [name2]=@Name2, [secret]=@Secret, [validUntil]=@ValidUntil, [renewUntil]=@RenewUntil, [id_remote]=@IdRemote WHERE [id]=@Id AND [type]=@Type
IF @@ROWCOUNT = 0 INSERT INTO [main-user-tokens] ([id], [type], [name], [name2], [secret], [validUntil], [renewUntil], [id_remote]) VALUES (@Id, @Type, @Name, @Name2, @Secret, @ValidUntil, @RenewUntil, @IdRemote)
SELECT @@ROWCOUNT
</Query>
<Query Name="GetComputerVitalSignInfoForIntune">