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

Refactor Citrix virtual session data collection

Browse Source
This commit is contained in:
Drechsler, Meik
2026-07-22 11:57:15 +02:00
parent 02fabc91cf
commit 2770ebbb6d
12 changed files with 651 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
F4SDwebService/Config/F4SD-DataClusters-Configuration.xml
View File

@@ -1338,6 +1338,79 @@
</Table>
</DataCluster>
<DataCluster Name="citrixMetrics" Origin="Citrix" InformationClass="VirtualSession">
<Table Name="citrix-session-details" Type="Static" Key="Id">
<Table-Columns>
<!-- basic session properties -->
<Table-Column Name="Id" SourceName ="SessionKey" Type="guid" />
<Table-Column Name="StartDate" Type="datetime" />
<Table-Column Name="EndDate" Type="datetime" />
<Table-Column Name="LogOnDuration" Type="int" />
<Table-Column Name="ConnectionState" Type="int" Cardinal="64" />
<Table-Column Name="EndpointName" Type="string" Cardinal="64" />
<Table-Column Name="IsAnonymous" Type="boolean" />
<!-- machine properties -->
<Table-Column Name="Mch_Id" SourceName="Machine.Id" Type="guid" />
<Table-Column Name="Mch_Name" SourceName="Machine.Name" Type="string"/>
<Table-Column Name="Mch_DnsName" SourceName="Machine.DnsName" Type="string" />
<Table-Column Name="Mch_IPAddress" SourceName="Machine.IPAddress" Type="string" />
<Table-Column Name="Mch_HostedMachine" SourceName="Machine.HostedMachineId" Type="string" />
<Table-Column Name="Mch_IsInMaintenanceMode" SourceName="Machine.IsInMaintenanceMode" Type="boolean" />
<Table-Column Name="Mch_AgentVersion" SourceName="Machine.AgentVersion" Type="string" />
<Table-Column Name="Mch_CurrentRegistrationState" SourceName="Machine.CurrentRegistrationState" Type="int" Default="0" />
<Table-Column Name="Mch_CurrentSessionCount" SourceName="Machine.CurrentSessionCount" Type="int" />
<Table-Column Name="Mch_WindowsConnectionSetting" SourceName="Machine.WindowsConnectionSetting" Type="int" Default="0" />
<Table-Column Name="Mch_OSType" SourceName="Machine.OSType" Type="string" />
<Table-Column Name="Ctl_Name" SourceName="Machine.Catalog.Name" Type="string" Default="0" />
<Table-Column Name="Ctl_AllocationType" SourceName="Machine.Catalog.AllocationType" Type="int" Default="0" />
<Table-Column Name="DGrp_Name" SourceName="Machine.DesktopGroup.Name" Type="string" />
<Table-Column Name="CLI_Cpu" SourceName="Machine.CurrentLoadIndex.Cpu" Type="int" Default="0" />
<Table-Column Name="CLI_Memory" SourceName="Machine.CurrentLoadIndex.Memory" Type="int" Default="0" />
<Table-Column Name="CLI_Disk" SourceName="Machine.CurrentLoadIndex.Disk" Type="int" Default="0" />
<!-- user properties -->
<Table-Column Name="Usr_Id" SourceName="User.Id" Type="int" />
<Table-Column Name="Usr_Name" SourceName="User.UserName" Type="string"/>
<Table-Column Name="Usr_FullName" SourceName="User.FullName" Type="string"/>
<Table-Column Name="Usr_Domain" SourceName="User.Domain" Type="string"/>
<!-- connection properties -->
<Table-Column Name="Con_Id" SourceName="CurrentConnection.Id" Type="guid" />
<Table-Column Name="Con_ClientName" SourceName="CurrentConnection.ClientName" Type="string" />
<Table-Column Name="Con_ClientAddress" SourceName="CurrentConnection.ClientAddress" Type="string" />
<Table-Column Name="Con_ClientVersion" SourceName="CurrentConnection.ClientVersion" Type="string" />
<Table-Column Name="Con_ClientPlatform" SourceName="CurrentConnection.ClientPlatform" Type="string" />
<Table-Column Name="Con_ConnectedViaIPAddress" SourceName="CurrentConnection.ConnectedViaIPAddress" Type="string" />
<Table-Column Name="Con_LaunchedViaHostName" SourceName="CurrentConnection.LaunchedViaHostName" Type="string" />
<Table-Column Name="Con_LogOnStartDate" SourceName="CurrentConnection.LogOnStartDate" Type="datetime" />
<Table-Column Name="Con_LogOnEndDate" SourceName="CurrentConnection.LogOnEndDate" Type="datetime" />
<Table-Column Name="Con_BrokeringDuration" SourceName="CurrentConnection.BrokeringDuration" Type="int" />
<Table-Column Name="Con_VMStartStartDate" SourceName="CurrentConnection.VMStartStartDate" Type="datetime" />
<Table-Column Name="Con_VMStartEndDate" SourceName="CurrentConnection.VMStartEndDate" Type="datetime" />
<Table-Column Name="Con_HdxStartDate" SourceName="CurrentConnection.HdxStartDate" Type="datetime" />
<Table-Column Name="Con_HdxEndDate" SourceName="CurrentConnection.HdxEndDate" Type="datetime" />
<Table-Column Name="Con_AuthenticationDuration" SourceName="CurrentConnection.AuthenticationDuration" Type="int" />
<Table-Column Name="Con_GpoStartDate" SourceName="CurrentConnection.GpoStartDate" Type="datetime" />
<Table-Column Name="Con_GpoEndDate" SourceName="CurrentConnection.GpoEndDate" Type="datetime" />
<Table-Column Name="Con_LogOnScriptsStartDate" SourceName="CurrentConnection.LogOnScriptsStartDate" Type="datetime" />
<Table-Column Name="Con_LogOnScriptsEndDate" SourceName="CurrentConnection.LogOnScriptsEndDate" Type="datetime" />
<Table-Column Name="Con_ProfileLoadStartDate" SourceName="CurrentConnection.ProfileLoadStartDate" Type="datetime" />
<Table-Column Name="Con_ProfileLoadEndDate" SourceName="CurrentConnection.ProfileLoadEndDate" Type="datetime" />
<Table-Column Name="Con_InteractiveStartDate" SourceName="CurrentConnection.InteractiveStartDate" Type="datetime" />
<Table-Column Name="Con_InteractiveEndDate" SourceName="CurrentConnection.InteractiveEndDate" Type="datetime" />
<Table-Column Name="Con_UserInitStartDate" SourceName="CurrentConnection.UserInitStartDate" Type="datetime" />
<Table-Column Name="Con_UserInitEndDate" SourceName="CurrentConnection.UserInitEndDate" Type="datetime" />
<Table-Column Name="Con_AppxAssociationStartDate" SourceName="CurrentConnection.AppxAssociationStartDate" Type="datetime" />
<Table-Column Name="Con_AppxAssociationEndDate" SourceName="CurrentConnection.AppxAssociationEndDate" Type="datetime" />
<Table-Column Name="Con_AppxLoadPackageStartDate" SourceName="CurrentConnection.AppxLoadPackageStartDate" Type="datetime" />
<Table-Column Name="Con_AppxLoadPackageEndDate" SourceName="CurrentConnection.AppxLoadPackageEndDate" Type="datetime" />
<!-- additional site infos from configuration-->
<Table-Column Name="SiteId" Type="guid" />
<Table-Column Name="SiteName" Type="guid" />
</Table-Columns>
</Table>
<Table Name="citrix-session" Type="Static" Key="Id">
<Table-Columns>
<Table-Column Name="Id" SourceName ="SessionKey" Type="guid" />

2
F4SDwebService/Config/F4SD-HealthCard-Configuration.xml
View File

@@ -1530,7 +1530,7 @@
<State-Info Name="User Info" ValueTable="Computation_EmptyConstant" ValueColumn="default">
<Name Lang="DE">Benutzer-Informationen</Name>
</State-Info>
<State-Info Name="User Name" ValueTable="citrix-session-user" ValueColumn="UserName">
<State-Info Name="User Name" ValueTable="citrix-session-details" ValueColumn="Usr_Name">
<Name Lang="DE">Benutzername</Name>
</State-Info>
<State-Info Name="Fullname" ValueTable="citrix-session-user" ValueColumn="FullName">

73
F4SDwebService/Publish/Config/F4SD-DataClusters-Configuration.xml
View File

@@ -1338,6 +1338,79 @@
</Table>
</DataCluster>
<DataCluster Name="citrixMetrics" Origin="Citrix" InformationClass="VirtualSession">
<Table Name="citrix-session-details" Type="Static" Key="Id">
<Table-Columns>
<!-- basic session properties -->
<Table-Column Name="Id" SourceName ="SessionKey" Type="guid" />
<Table-Column Name="StartDate" Type="datetime" />
<Table-Column Name="EndDate" Type="datetime" />
<Table-Column Name="LogOnDuration" Type="int" />
<Table-Column Name="ConnectionState" Type="int" Cardinal="64" />
<Table-Column Name="EndpointName" Type="string" Cardinal="64" />
<Table-Column Name="IsAnonymous" Type="boolean" />
<!-- machine properties -->
<Table-Column Name="Mch_Id" SourceName="Machine.Id" Type="guid" />
<Table-Column Name="Mch_Name" SourceName="Machine.Name" Type="string"/>
<Table-Column Name="Mch_DnsName" SourceName="Machine.DnsName" Type="string" />
<Table-Column Name="Mch_IPAddress" SourceName="Machine.IPAddress" Type="string" />
<Table-Column Name="Mch_HostedMachine" SourceName="Machine.HostedMachineId" Type="string" />
<Table-Column Name="Mch_IsInMaintenanceMode" SourceName="Machine.IsInMaintenanceMode" Type="boolean" />
<Table-Column Name="Mch_AgentVersion" SourceName="Machine.AgentVersion" Type="string" />
<Table-Column Name="Mch_CurrentRegistrationState" SourceName="Machine.CurrentRegistrationState" Type="int" Default="0" />
<Table-Column Name="Mch_CurrentSessionCount" SourceName="Machine.CurrentSessionCount" Type="int" />
<Table-Column Name="Mch_WindowsConnectionSetting" SourceName="Machine.WindowsConnectionSetting" Type="int" Default="0" />
<Table-Column Name="Mch_OSType" SourceName="Machine.OSType" Type="string" />
<Table-Column Name="Ctl_Name" SourceName="Machine.Catalog.Name" Type="string" Default="0" />
<Table-Column Name="Ctl_AllocationType" SourceName="Machine.Catalog.AllocationType" Type="int" Default="0" />
<Table-Column Name="DGrp_Name" SourceName="Machine.DesktopGroup.Name" Type="string" />
<Table-Column Name="CLI_Cpu" SourceName="Machine.CurrentLoadIndex.Cpu" Type="int" Default="0" />
<Table-Column Name="CLI_Memory" SourceName="Machine.CurrentLoadIndex.Memory" Type="int" Default="0" />
<Table-Column Name="CLI_Disk" SourceName="Machine.CurrentLoadIndex.Disk" Type="int" Default="0" />
<!-- user properties -->
<Table-Column Name="Usr_Id" SourceName="User.Id" Type="int" />
<Table-Column Name="Usr_Name" SourceName="User.UserName" Type="string"/>
<Table-Column Name="Usr_FullName" SourceName="User.FullName" Type="string"/>
<Table-Column Name="Usr_Domain" SourceName="User.Domain" Type="string"/>
<!-- connection properties -->
<Table-Column Name="Con_Id" SourceName="CurrentConnection.Id" Type="guid" />
<Table-Column Name="Con_ClientName" SourceName="CurrentConnection.ClientName" Type="string" />
<Table-Column Name="Con_ClientAddress" SourceName="CurrentConnection.ClientAddress" Type="string" />
<Table-Column Name="Con_ClientVersion" SourceName="CurrentConnection.ClientVersion" Type="string" />
<Table-Column Name="Con_ClientPlatform" SourceName="CurrentConnection.ClientPlatform" Type="string" />
<Table-Column Name="Con_ConnectedViaIPAddress" SourceName="CurrentConnection.ConnectedViaIPAddress" Type="string" />
<Table-Column Name="Con_LaunchedViaHostName" SourceName="CurrentConnection.LaunchedViaHostName" Type="string" />
<Table-Column Name="Con_LogOnStartDate" SourceName="CurrentConnection.LogOnStartDate" Type="datetime" />
<Table-Column Name="Con_LogOnEndDate" SourceName="CurrentConnection.LogOnEndDate" Type="datetime" />
<Table-Column Name="Con_BrokeringDuration" SourceName="CurrentConnection.BrokeringDuration" Type="int" />
<Table-Column Name="Con_VMStartStartDate" SourceName="CurrentConnection.VMStartStartDate" Type="datetime" />
<Table-Column Name="Con_VMStartEndDate" SourceName="CurrentConnection.VMStartEndDate" Type="datetime" />
<Table-Column Name="Con_HdxStartDate" SourceName="CurrentConnection.HdxStartDate" Type="datetime" />
<Table-Column Name="Con_HdxEndDate" SourceName="CurrentConnection.HdxEndDate" Type="datetime" />
<Table-Column Name="Con_AuthenticationDuration" SourceName="CurrentConnection.AuthenticationDuration" Type="int" />
<Table-Column Name="Con_GpoStartDate" SourceName="CurrentConnection.GpoStartDate" Type="datetime" />
<Table-Column Name="Con_GpoEndDate" SourceName="CurrentConnection.GpoEndDate" Type="datetime" />
<Table-Column Name="Con_LogOnScriptsStartDate" SourceName="CurrentConnection.LogOnScriptsStartDate" Type="datetime" />
<Table-Column Name="Con_LogOnScriptsEndDate" SourceName="CurrentConnection.LogOnScriptsEndDate" Type="datetime" />
<Table-Column Name="Con_ProfileLoadStartDate" SourceName="CurrentConnection.ProfileLoadStartDate" Type="datetime" />
<Table-Column Name="Con_ProfileLoadEndDate" SourceName="CurrentConnection.ProfileLoadEndDate" Type="datetime" />
<Table-Column Name="Con_InteractiveStartDate" SourceName="CurrentConnection.InteractiveStartDate" Type="datetime" />
<Table-Column Name="Con_InteractiveEndDate" SourceName="CurrentConnection.InteractiveEndDate" Type="datetime" />
<Table-Column Name="Con_UserInitStartDate" SourceName="CurrentConnection.UserInitStartDate" Type="datetime" />
<Table-Column Name="Con_UserInitEndDate" SourceName="CurrentConnection.UserInitEndDate" Type="datetime" />
<Table-Column Name="Con_AppxAssociationStartDate" SourceName="CurrentConnection.AppxAssociationStartDate" Type="datetime" />
<Table-Column Name="Con_AppxAssociationEndDate" SourceName="CurrentConnection.AppxAssociationEndDate" Type="datetime" />
<Table-Column Name="Con_AppxLoadPackageStartDate" SourceName="CurrentConnection.AppxLoadPackageStartDate" Type="datetime" />
<Table-Column Name="Con_AppxLoadPackageEndDate" SourceName="CurrentConnection.AppxLoadPackageEndDate" Type="datetime" />
<!-- additional site infos from configuration-->
<Table-Column Name="SiteId" Type="guid" />
<Table-Column Name="SiteName" Type="guid" />
</Table-Columns>
</Table>
<Table Name="citrix-session" Type="Static" Key="Id">
<Table-Columns>
<Table-Column Name="Id" SourceName ="SessionKey" Type="guid" />

2
F4SDwebService/Publish/Config/F4SD-HealthCard-Configuration.xml
View File

@@ -1530,7 +1530,7 @@
<State-Info Name="User Info" ValueTable="Computation_EmptyConstant" ValueColumn="default">
<Name Lang="DE">Benutzer-Informationen</Name>
</State-Info>
<State-Info Name="User Name" ValueTable="citrix-session-user" ValueColumn="UserName">
<State-Info Name="User Name" ValueTable="citrix-session-details" ValueColumn="Usr_Name">
<Name Lang="DE">Benutzername</Name>
</State-Info>
<State-Info Name="Fullname" ValueTable="citrix-session-user" ValueColumn="FullName">