- fix hemtt config to copy example

- add measurements table in Readme - ENTITY COUNTS - re add side tags - use `side group _x` for units and players - fix players_connected and add headless_clients - get `_allUserInfos = allUsers apply {getUserInfo _x} select {count _x > 0};` from main loop and use in entity counts and player performance
Merge branch 'master' into develop
2023-10-10 18:07:25 -07:00 · 2023-10-10 18:04:00 -07:00 · 2023-10-10 14:05:49 -07:00 · 2023-10-10 17:04:06 -04:00
6 changed files with 85 additions and 25 deletions
--- a/.github/workflows/go-dev.yml
+++ b/.github/workflows/go-dev.yml
@@ -10,11 +10,11 @@ on:
    branches: ["develop"]

 jobs:
-  build:
+  BuildWin64:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
-      - name: BuildWin64
+      - name: build
        uses: addnab/docker-run-action@v3
        with:
          image: x1unix/go-mingw:1.20
@@ -23,7 +23,10 @@ jobs:
          run: |
            go build -o ./ifxmetrics_x64.dll -buildmode=c-shared -buildvcs=false -ldflags "-w -s -X main.EXTENSION_VERSION=${{github.ref_name}}-${{github.sha}}" ./extension/cmd

-      - name: BuildWin32
+  BuildWin32:
+    runs-on: ubuntu-latest
+    steps:
+      - name: build
        uses: addnab/docker-run-action@v3
        with:
          image: x1unix/go-mingw:1.20
--- a/.hemtt/project.toml
+++ b/.hemtt/project.toml
@@ -9,7 +9,7 @@ git_hash=6                                # Default: 8

 [files]
 include=[
-  "ifxmetrics.config.json",
+  "ifxmetrics.config.example.json",
  "LICENSE",
  "README.md",
  "mod.cpp",
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ In the below example, the `milsimServerEfficiency` event handler will send data
 // ...
  "cbaEventHandlers": {
    "milsimServerEfficiency": {
-      "name": "milsimServerEfficiency",
+      "eventName": "milsimServerEfficiency",
      "description": "EVENTHANDLER. Tracks the efficiency of the server.",
      "enabled": true,
      "bucket": "server_performance",
@@ -105,6 +105,58 @@ Grafana is a dashboarding tool. It is used to display the data from InfluxDB. A

 ---

+## CORE METRICS
+
+These metrics will be gathered by default every `refreshRateMs` milliseconds.
+
+| Bucket | Measurement | Tags | Field |
+| --- | --- | --- | --- |
+| server_performance | fps | profile=`profileName` world=`worldName` server=`serverName` | fps_avg=`diag_fps` |
+| server_performance | fps | ... | fps_min=`diag_fpsMin` |
+| server_performance | running_scripts | ... | spawn=`diag_activeScripts#0` |
+| server_performance | running_scripts | ... | execVM=`diag_activeScripts#1` |
+| server_performance | running_scripts | ... | exec=`diag_activeScripts#2` |
+| server_performance | running_scripts | ... | execFSM=`diag_activeScripts#3` |
+| server_performance | running_scripts | ... | pfh=`count CBA_common_perFrameHandlerArray \|\| 0` |
+| server_performance | entities_remote | ... + side=`WEST`,`EAST`, etc | units_alive=`{side group _x isEqualTo _thisSide && not (local _x)} count _allUnits` |
+| server_performance | entities_remote | ... + side=`WEST`,`EAST`, etc | units_dead=`{side group _x isEqualTo _thisSide && not (local _x)} count _allDeadMen` |
+| server_performance | entities_remote | ... + side=`WEST`,`EAST`, etc | groups_total=`{side _x isEqualTo _thisSide && not (local _x)} count _allGroups` |
+| server_performance | entities_remote | ... + side=`WEST`,`EAST`, etc | vehicles_total=`{side _x isEqualTo _thisSide && not (local _x) && !(_x isKindOf "WeaponHolderSimulated")} count _vehicles` |
+| server_performance | entities_remote | ... + side=`WEST`,`EAST`, etc | vehicles_weaponholder=`{side _x isEqualTo _thisSide && not (local _x) && (_x isKindOf "WeaponHolderSimulated")} count _vehicles` |
+| server_performance | entities_local | ... + side=`WEST`,`EAST`, etc | units_alive=`{side group _x isEqualTo _thisSide && (local _x)} count _allUnits` |
+| server_performance | entities_local | ... + side=`WEST`,`EAST`, etc | units_dead=`{side group _x isEqualTo _thisSide && (local _x)} count _allDeadMen` |
+| server_performance | entities_local | ... + side=`WEST`,`EAST`, etc | groups_total=`{side _x isEqualTo _thisSide && (local _x)} count _allGroups` |
+| server_performance | entities_local | ... + side=`WEST`,`EAST`, etc | vehicles_total=`{side _x isEqualTo _thisSide && (local _x) && !(_x isKindOf "WeaponHolderSimulated")} count _vehicles` |
+| server_performance | entities_local | ... + side=`WEST`,`EAST`, etc | vehicles_weaponholder=`{side _x isEqualTo _thisSide && (local _x) && (_x isKindOf "WeaponHolderSimulated")} count _vehicles` |
+| server_performance | entities_global | ... + side=`WEST`,`EAST`, etc | units_alive=`{side group _x isEqualTo _thisSide} count _allUnits` |
+| server_performance | entities_global | ... + side=`WEST`,`EAST`, etc | units_dead=`{side group _x isEqualTo _thisSide} count _allDeadMen` |
+| server_performance | entities_global | ... + side=`WEST`,`EAST`, etc | groups_total=`{side _x isEqualTo _thisSide} count _allGroups` |
+| server_performance | entities_global | ... + side=`WEST`,`EAST`, etc | vehicles_total=`{side _x isEqualTo _thisSide && !(_x isKindOf "WeaponHolderSimulated")} count _vehicles` |
+| server_performance | entities_global | ... + side=`WEST`,`EAST`, etc | vehicles_weaponholder=`{side _x isEqualTo _thisSide && (_x isKindOf "WeaponHolderSimulated")} count _vehicles` |
+| server_performance | entities_global | ... + side=`WEST`,`EAST`, etc | players_alive=`{side group _x isEqualTo _thisSide && alive _x} count (call BIS_fnc_listPlayers)` |
+| server_performance | entities_global | ... + side=`WEST`,`EAST`, etc | players_dead=`{side group _x isEqualTo _thisSide && !alive _x} count (call BIS_fnc_listPlayers)` |
+| server_performance | player_count | ... | players_connected=`count (_allUserInfos select {_x#7 isEqualTo false})` |
+| server_performance | player_count | ... | headless_clients_connected=`count (_allUserInfos select {_x#7 isEqualTo true})` |
+| player_performance | network | ... + playerUID=`getUserInfo#2`, playerName=`getUserInfo#3` | avgPing=`getUserInfo#9#0` |
+| player_performance | network | ... + playerUID=`getUserInfo#2`, playerName=`getUserInfo#3` | avgBandwidth=`getUserInfo#9#1` |
+| player_performance | network | ... + playerUID=`getUserInfo#2`, playerName=`getUserInfo#3` | desync=`getUserInfo#9#2` |
+| mission_data | server_time | ... | diag_tickTime=`diag_tickTime` |
+| mission_data | server_time | ... | serverTime=`time` |
+| mission_data | server_time | ... | timeMultiplier=`timeMultiplier` |
+| mission_data | server_time | ... | accTime=`accTime` |
+| mission_data | weather | ... | fog=`fog` |
+| mission_data | weather | ... | overcast=`overcast` |
+| mission_data | weather | ... | rain=`rain` |
+| mission_data | weather | ... | humidity=`humidity` |
+| mission_data | weather | ... | waves=`waves` |
+| mission_data | weather | ... | windDir=`windDir` |
+| mission_data | weather | ... | windStr=`windStr` |
+| mission_data | weather | ... | gusts=`gusts` |
+| mission_data | weather | ... | lightnings=`lightnings` |
+| mission_data | weather | ... | moonIntensity=`moonIntensity` |
+| mission_data | weather | ... | moonPhase=`moonPhase` |
+| mission_data | weather | ... | sunOrMoon=`sunOrMoon` |
+
 ## BUILDING

 Set an environment variable in your terminal with the desired extension build version. It defaults to "DEVELOPMENT".
--- a/addons/capture/fnc_entity_count.sqf
+++ b/addons/capture/fnc_entity_count.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"

+params ["_allUserInfos", [], [[]]];
+
 private _hashesOut = [];

 private _allUnits = allUnits;
@@ -10,18 +12,20 @@ private _allPlayers = call BIS_fnc_listPlayers;
 {
 	private _thisSide = _x;
 	private _thisSideStr = _thisSide call BIS_fnc_sideNameUnlocalized;
+	private _tags = +GVARMAIN(standardTags);
+	_tags pushBack ["side", _thisSideStr];
 	// Number of remote units
 	_hashesOut pushBack ([
 		["bucket", "server_performance"],
 		["measurement", "entities_remote"],
-		["tags", GVARMAIN(standardTags)],
+		["tags", _tags],
 		["fields", [
 			["units_alive", {
-				side _x isEqualTo _thisSide &&
+				side group _x isEqualTo _thisSide &&
 				not (local _x)
 			} count _allUnits],
 			["units_dead", {
-				side _x isEqualTo _thisSide &&
+				side group _x isEqualTo _thisSide &&
 				not (local _x)
 			} count _allDeadMen],
 			["groups_total", {
@@ -45,14 +49,14 @@ private _allPlayers = call BIS_fnc_listPlayers;
 	_hashesOut pushBack ([
 		["bucket", "server_performance"],
 		["measurement", "entities_local"],
-		["tags", GVARMAIN(standardTags)],
+		["tags", _tags],
 		["fields", [
 			["units_alive", {
-				side _x isEqualTo _thisSide &&
+				side group _x isEqualTo _thisSide &&
 				local _x
 			} count _allUnits],
 			["units_dead", {
-				side _x isEqualTo _thisSide &&
+				side group _x isEqualTo _thisSide &&
 				local _x
 			} count _allDeadMen],
 			["groups_total", {
@@ -78,13 +82,13 @@ private _allPlayers = call BIS_fnc_listPlayers;
 		_hashesOut pushBack ([
 			["bucket", "server_performance"],
 			["measurement", "entities_global"],
-			["tags", GVARMAIN(standardTags)],
+			["tags", _tags],
 			["fields", [
 				["units_alive", {
-					side _x isEqualTo _thisSide
+					side group _x isEqualTo _thisSide
 				} count _allUnits],
 				["units_dead", {
-					side _x isEqualTo _thisSide
+					side group _x isEqualTo _thisSide
 				} count _allDeadMen],
 				["groups_total", {
 					side _x isEqualTo _thisSide
@@ -98,11 +102,11 @@ private _allPlayers = call BIS_fnc_listPlayers;
 					(_x isKindOf "WeaponHolderSimulated")
 				} count _vehicles],
 				["players_alive", {
-					side _x isEqualTo _thisSide &&
+					side group _x isEqualTo _thisSide &&
 					alive _x
 				} count _allPlayers],
 				["players_dead", {
-					side _x isEqualTo _thisSide &&
+					side group _x isEqualTo _thisSide &&
 					!alive _x
 				} count _allPlayers]
 			]]
@@ -116,12 +120,8 @@ if (isServer) then {
 		["measurement", "player_count"],
 		["tags", GVARMAIN(standardTags)],
 		["fields", [
-			["players_connected", {
-				private _info = getUserInfo (getPlayerId _x);
-				if (!isNil "_info" && {count _info >= 6}) then {
-					_info select 7
-				} else {false}
-			} count _allPlayers]
+			["players_connected", count (_allUserInfos select {_x#7 isEqualTo false})],
+			["headless_clients_connected", count (_allUserInfos select {_x#7 isEqualTo true})]
 		]]
 	]);
 };
--- a/addons/capture/fnc_player_performance.sqf
+++ b/addons/capture/fnc_player_performance.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"

+params ["_allUserInfos", [], [[]]];
+
 private _hashesOut = [];
 {
 	_x params ["_playerID", "_ownerId", "_playerUID", "_profileName", "_displayName", "_steamName", "_clientState", "_isHC", "_adminState", "_networkInfo", "_unit"];
@@ -23,6 +25,6 @@ private _hashesOut = [];
 			["desync", _desync]
 		]]
 	]);
-} forEach (allUsers apply {getUserInfo _x});
+} forEach _allUserInfos;

 _hashesOut;
--- a/addons/main/fnc_captureLoop.sqf
+++ b/addons/main/fnc_captureLoop.sqf
@@ -24,19 +24,22 @@ GVARMAIN(captureLoop) = [
            ]
        ];
    
+
+        // getUserInfo for all users
+        _allUserInfos = allUsers apply {getUserInfo _x} select {count _x > 0};
        // entity_count returns an array of hashMap
        {
            GVARMAIN(extensionName) callExtension [
                ":INFLUX:WRITE:",
                [_x]
            ];
-        } forEach (call EFUNC(capture,entity_count));
+        } forEach ([_allUserInfos] call EFUNC(capture,entity_count));
        {
            GVARMAIN(extensionName) callExtension [
                ":INFLUX:WRITE:",
                [_x]
            ];
-        } forEach (call EFUNC(capture,player_performance));
+        } forEach ([_allUserInfos] call EFUNC(capture,player_performance));

        ["DEBUG", format[
            "Processed primary data loop in %1 ms",
Author	SHA1	Message	Date
IndigoFox	98829640f4	- fix hemtt config to copy example - add measurements table in Readme - ENTITY COUNTS - re add side tags - use `side group _x` for units and players - fix players_connected and add headless_clients - get `_allUserInfos = allUsers apply {getUserInfo _x} select {count _x > 0};` from main loop and use in entity counts and player performance	2023-10-10 18:07:25 -07:00
IndigoFox	9ccb6fd3cd	Merge branch 'master' into develop	2023-10-10 18:04:00 -07:00
IndigoFox	4ec9e007df	minor readme update	2023-10-10 14:05:49 -07:00
Indigo	7c04dd5138	Merge pull request #1 from indig0fox/develop MAJOR rework	2023-10-10 17:04:06 -04:00