🧹 fix asset filters in asset-count query pack (#84)

Signed-off-by: Patrick Münch <[email protected]>
mondoohq · Aug 1, 2023 · 8f27930 · 8f27930
1 parent d495d50
commit 8f27930
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -1,3 +1,4 @@
+Adddays
 cea
 CUSTOMERID
 ipaddress

diff --git a/extra/mondoo-asset-count.mql.yaml b/extra/mondoo-asset-count.mql.yaml
@@ -12,7 +12,11 @@ packs:
         filters: asset.platform == 'azure' || asset.platform == 'microsoft365' 
         queries: 
           - uid: mondoo-asset-count-on-azure
-          - uid: mondoo-count-users-in-azure  
+          - uid: mondoo-count-users-in-azure
+      - title: Windows Active Directory asset counts
+        filters: asset.platform == "windows"
+        queries:
+          - uid: mondoo-asset-count-in-windows-domain
       - title: AWS asset counts
         filters: asset.platform == "aws" 
         queries:
@@ -56,24 +60,20 @@ packs:
     queries:
       - uid: mondoo-asset-count-on-vsphere-cluster-esxi
         title: Retrieve all ESXi hosts
-        filters: asset.platform == 'vmware-vsphere'
         query: |
           vsphere.datacenters { hosts.length }
 
       - uid: mondoo-asset-count-on-vsphere-cluster-vms
         title: Retrieve all VMs from vSphere cluster
-        filters: asset.platform == 'vmware-vsphere'
         query: |
           vsphere.datacenters { vms.length }
 
       - uid: mondoo-asset-count-on-azure
-        filters: asset.platform == 'azure' || asset.platform == 'microsoft365' 
         title: Retrieve all VMs from Azure
         query: |
           azure.compute.vms.length
 
       - uid: mondoo-count-users-in-azure
-        filters: asset.platform == 'azure' || asset.platform == 'microsoft365' 
         title: Retrieve all users from Azure
         query: |
           azuread.users.length
@@ -238,6 +238,5 @@ packs:
 
       - uid: mondoo-asset-count-in-windows-domain
         title: Retrieve all computer object from the Windows domain
-        filters: asset.platform == "windows" && windows.computerInfo['OsProductType'] == 2
         query: |
-          parse.json(content: powershell('Get-ADComputer -Filter * -properties * | select Name, Enabled,Operatingsystem,OperatingSystemVersion | ConvertTo-Json').stdout).params
+          parse.json(content: powershell('$time = (Get-Date).Adddays(-(180));Get-ADComputer -Filter {LastLogonTimeStamp -ge $time} -properties * | select Name,Enabled,OperatingSystem,OperatingSystemVersion,LastLogonDate | ConvertTo-Json').stdout).params