From 0c4e1cfb3e00c1c30beea4bb187a9dbbbf6ae3bb Mon Sep 17 00:00:00 2001 From: Zack T Date: Fri, 3 Nov 2023 12:58:34 -0700 Subject: [PATCH] Minor improvements * Improved description verbiage * Spell checking * Syntax Case --- .../Queries-Computer Details.sql | 11 ++-- .../Queries-MDM Command Reports.sql | 66 +++++++++---------- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-Computer Details.sql b/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-Computer Details.sql index e14d208..6cbe773 100644 --- a/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-Computer Details.sql +++ b/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-Computer Details.sql @@ -54,7 +54,7 @@ SELECT computers_denormalized.operating_system_version LIKE "14.%" ) THEN "True" ELSE "False" - END AS "Running Latest Major OS", + END AS "Latest Major OS Installed", IF( ( computers_denormalized.computer_id IN ( @@ -82,7 +82,7 @@ SELECT computers_denormalized.operating_system_version LIKE "13.%" and patch_software_titles.id = 54 ) ) - ), "True", "False") AS "Running Latest Patch", + ), "True", "False") AS "Latest Patch Installed", ea.last_os_update_installed AS "Last OS Update Installed", computers_denormalized.active_directory_status AS "Active Directory Status", ea.unit AS "Unit", @@ -113,7 +113,7 @@ LEFT JOIN ( MAX(CASE WHEN extension_attribute_id = 65 THEN value_on_client END) AS "primary_location", MAX(CASE WHEN extension_attribute_id = 71 THEN value_on_client END) AS "last_os_update_installed" FROM extension_attribute_values - WHERE extension_attribute_id in (62, 63, 64, 65, 71) + WHERE extension_attribute_id IN (62, 63, 64, 65, 71) GROUP BY report_id ) AS ea ON ea.report_id = r.report_id @@ -200,7 +200,8 @@ SELECT WHERE computers_denormalized.is_managed = 1 -- When looking for duplicates, only checked against managed if the records GROUP BY serial_number HAVING COUNT(serial_number) > 1 - ), "True", "False") AS "Duplicate Serial Numbers", + ), "True", "False" + ) AS "Duplicate Serial Numbers", IF( computers_denormalized.last_contact_time_epoch = 0, "Never", DATE(date_sub(FROM_unixtime(computers_denormalized.last_contact_time_epoch/1000), INTERVAL 1 DAY)) @@ -375,7 +376,7 @@ LEFT JOIN ( MAX(CASE WHEN extension_attribute_id = 58 THEN value_on_client END) AS "falcon_status", MAX(CASE WHEN extension_attribute_id = 57 THEN value_on_client END) AS "falcon_version" FROM extension_attribute_values - WHERE extension_attribute_id in (57, 58) + WHERE extension_attribute_id IN (57, 58) GROUP BY report_id ) AS ea ON ea.report_id = r.report_id diff --git a/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-MDM Command Reports.sql b/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-MDM Command Reports.sql index deb6a62..2c1dc33 100644 --- a/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-MDM Command Reports.sql +++ b/Jamf Pro/Reporting/Database Maintenance and SQL Queries/Queries-MDM Command Reports.sql @@ -49,11 +49,11 @@ SELECT mdm_cmds.apns_result_status AS "Result", CASE WHEN ( - mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") + mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") AND sites_mac.site_name IS NOT NULL ) THEN sites_mac.site_name WHEN ( - mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") + mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND sites_mobile.site_name IS NOT NULL ) THEN sites_mobile.site_name ELSE "None" @@ -61,7 +61,7 @@ SELECT mdm_c.client_type AS "Client Type", CASE WHEN mdm_c.client_type = "COMPUTER" THEN mac_denorm.computer_id - WHEN mdm_c.client_type in ("MOBILE_DEVICE", "TV") THEN mobile_denorm.mobile_device_id + WHEN mdm_c.client_type IN ("MOBILE_DEVICE", "TV") THEN mobile_denorm.mobile_device_id WHEN mdm_c.client_type = "COMPUTER_USER" THEN cupt.computer_id WHEN mdm_c.client_type = "MOBILE_DEVICE_USER" THEN pushtoken.device_management_id END AS "Device ID", @@ -72,19 +72,19 @@ SELECT mdm_cmds.profile_id AS "ID", CASE WHEN ( - mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") AND + mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") AND mdm_cmds.command REGEXP "^(Install|Remove)Profile$" ) THEN mac_cp.display_name WHEN ( - mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND + mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND mdm_cmds.command REGEXP "^(Install|Remove)Profile$" ) THEN mobile_cp.display_name WHEN ( - mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") AND + mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") AND mdm_cmds.command REGEXP "^(Install|Remove)Application$" ) THEN mac_apps.app_name WHEN ( - mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND + mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND mdm_cmds.command REGEXP "^(Install|Remove)Application$" ) THEN mobile_apps.app_name END AS "Name" @@ -152,18 +152,18 @@ DESC; -- ################################################## -- MDM Commands that result in an Error --- Count and results for MDM Commmands that resulted in an Error in last 24 hours +-- Count and results for MDM Commands that resulted in an Error in last 24 hours SELECT COUNT(mdm_cmds.apns_result_status) AS "Total", mdm_cmds.command AS "Command", mdm_cmds.error_localized_description AS "Description", CASE WHEN ( - mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") + mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") AND sites_mac.site_name IS NOT NULL ) THEN sites_mac.site_name WHEN ( - mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") + mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND sites_mobile.site_name IS NOT NULL ) THEN sites_mobile.site_name ELSE "None" @@ -172,19 +172,19 @@ SELECT mdm_cmds.profile_id AS "ID", CASE WHEN ( - mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") AND + mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") AND mdm_cmds.command REGEXP "^(Install|Remove)Profile$" ) THEN mac_cp.display_name WHEN ( - mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND + mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND mdm_cmds.command REGEXP "^(Install|Remove)Profile$" ) THEN mobile_cp.display_name WHEN ( - mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") AND + mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") AND mdm_cmds.command REGEXP "^(Install|Remove)Application$" ) THEN mac_apps.app_name WHEN ( - mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND + mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND mdm_cmds.command REGEXP "^(Install|Remove)Application$" ) THEN mobile_apps.app_name END AS "Name" @@ -252,26 +252,26 @@ SELECT mdm_c.client_type AS "Client Type", CASE WHEN ( - mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") + mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") AND sites_macs.site_name IS NOT NULL ) THEN sites_macs.site_name WHEN ( - mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") + mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND sites_mobiles.site_name IS NOT NULL ) THEN sites_mobiles.site_name ELSE "None" END AS `Device Site`, CASE - WHEN mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") THEN mac_denorm.computer_id - WHEN mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") THEN mobile_denorm.mobile_device_id + WHEN mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") THEN mac_denorm.computer_id + WHEN mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") THEN mobile_denorm.mobile_device_id END AS "Device ID", CASE WHEN ( - mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") + mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") AND sites_mac_apps.site_name IS NOT NULL ) THEN sites_mac_apps.site_name WHEN ( - mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") + mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND sites_mobile_apps.site_name IS NOT NULL ) THEN sites_mobile_apps.site_name ELSE "None" @@ -279,11 +279,11 @@ SELECT mdm_cmds.profile_id AS "App ID", CASE WHEN ( - mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") AND + mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") AND mdm_cmds.command REGEXP "^(Install|Remove)Application$" ) THEN mac_apps.app_name WHEN ( - mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND + mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND mdm_cmds.command REGEXP "^(Install|Remove)Application$" ) THEN mobile_apps.app_name END AS "Name", @@ -339,33 +339,33 @@ ORDER BY COUNT(*) DESC; --- Count and details on InstallApplication MDM Commands when count is greater than one, reardless of status +-- Count and details on InstallApplication MDM Commands when count is greater than one, regardless of status -- App Store Apps that Jamf Pro keeps trying to install on devices SELECT COUNT(*), mdm_c.client_type AS "Client Type", CASE WHEN ( - mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") + mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") AND sites_macs.site_name IS NOT NULL ) THEN sites_macs.site_name WHEN ( - mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") + mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND sites_mobiles.site_name IS NOT NULL ) THEN sites_mobiles.site_name ELSE "None" END AS `Device Site`, CASE - WHEN mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") THEN mac_denorm.computer_id - WHEN mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") THEN mobile_denorm.mobile_device_id + WHEN mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") THEN mac_denorm.computer_id + WHEN mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") THEN mobile_denorm.mobile_device_id END AS "Device ID", CASE WHEN ( - mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") + mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") AND sites_mac_apps.site_name IS NOT NULL ) THEN sites_mac_apps.site_name WHEN ( - mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") + mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND sites_mobile_apps.site_name IS NOT NULL ) THEN sites_mobile_apps.site_name ELSE "None" @@ -373,11 +373,11 @@ SELECT mdm_cmds.profile_id AS "App ID", CASE WHEN ( - mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") AND + mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") AND mdm_cmds.command REGEXP "^(Install|Remove)Application$" ) THEN mac_apps.app_name WHEN ( - mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND + mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND mdm_cmds.command REGEXP "^(Install|Remove)Application$" ) THEN mobile_apps.app_name END AS "Name", @@ -419,9 +419,9 @@ LEFT JOIN sites as sites_mobiles WHERE mdm_cmds.command = "InstallApplication" AND ( - mdm_c.client_type in ("COMPUTER", "COMPUTER_USER") AND mac_denorm.is_managed = 1 + mdm_c.client_type IN ("COMPUTER", "COMPUTER_USER") AND mac_denorm.is_managed = 1 OR - mdm_c.client_type in ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND mobile_denorm.is_managed + mdm_c.client_type IN ("MOBILE_DEVICE", "MOBILE_DEVICE_USER", "TV") AND mobile_denorm.is_managed ) GROUP BY mdm_c.client_type,