Skip to content

Commit

Permalink
Updated notification templates, README, and CHANGELOG
Browse files Browse the repository at this point in the history 
AutoPkgr will now notify with the `summary_result` of the following:
 - jamfcategoryuploader
 - jamfcomputergroupuploader
 - jamfdockitemuploader
 - jamfextensionattributeuploader
 - jamfpackageuploader
 - jamfpatchuploader
 - jamfpolicyuploader
 - jamfscriptuploader

README has been simplified to leverage the Wiki for all instructions.
  • Loading branch information
@shawnhonsberger
shawnhonsberger committed May 27, 2022
1 parent 2426739 commit a40f6be
Show file tree
Hide file tree
Showing 9 changed files with 469 additions and 563 deletions.
4 changes: 2 additions & 2 deletions AutoPkgr/Models/Integrations/LGJamfUploaderIntegration.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ + (BOOL)isUninstallable
return YES;
}

+ (NSString *)summaryResultKey
+ (NSArray *)summaryResultKey
{
return @"jamfuploader_summary_result";
return @[ @"jamfcategoryuploader_summary_result", @"jamfcomputergroupuploader_summary_result", @"jamfdockitemuploader_summary_result", @"jamfextensionattributeuploader_summary_result", @"jamfpackageuploader_summary_result", @"jamfpatchuploader_summary_result", @"jamfpolicyuploader_summary_result", @"jamfscriptuploader_summary_result" ];
}

#pragma mark - Instance overrides.
Expand Down
2 changes: 1 addition & 1 deletion AutoPkgr/Supporting Files/AutoPkgr-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1503</string>
<string>1505</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Expand Down
46 changes: 8 additions & 38 deletions AutoPkgr/Supporting Files/example_data.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,39 +100,24 @@ AutoPackagerError: Unknown processor &apos;io.github.hjuutilainen.VirusTotalAnal
<key>summary_text</key>
<string>The following packages were successfully installed:</string>
</dict>
<key>jamfuploader</key>
<key>jamfpolicyuploader</key>
<dict>
<key>data_rows</key>
<array>
<dict>
<key>category</key>
<string>Example Category</string>
<key>groups</key>
<string>Example-update-smart</string>
<key>pkg_name</key>
<string>Example.pkg</string>
<key>icon</key>
<string>Example.png</string>
<key>version</key>
<string>example_version</string>
<key>policy</key>
<string>Example Policy</string>
<key>template</key>
<string>Example Template</string>
<key>scripts</key>
<string>Example.sh</string>
<key>icon</key>
<string>Example.png</string>
</dict>
</array>
<key>header</key>
<array>
<string>category</string>
<string>groups</string>
<string>icon</string>
<string>pkg_name</string>
<string>version</string>
<string>policy</string>
<string>template</string>
<string>scripts</string>
<string>icon</string>
</array>
<key>summary_text</key>
<string>The following changes were made to Jamf Pro:</string>
Expand Down Expand Up @@ -325,39 +310,24 @@ AutoPackagerError: Unknown processor &apos;io.github.hjuutilainen.VirusTotalAnal
<key>summary_text</key>
<string>The following packages were successfully installed:</string>
</dict>
<key>jamfuploader_summary_result</key>
<key>jamfpolicyuploader_summary_result</key>
<dict>
<key>data_rows</key>
<array>
<dict>
<key>category</key>
<string>Example Category</string>
<key>groups</key>
<string>Example-update-smart</string>
<key>pkg_name</key>
<string>Example.pkg</string>
<key>icon</key>
<string>Example.png</string>
<key>version</key>
<string>example_version</string>
<key>policy</key>
<string>Example Policy</string>
<key>template</key>
<string>Example Template</string>
<key>scripts</key>
<string>Example.sh</string>
<key>icon</key>
<string>Example.png</string>
</dict>
</array>
<key>header</key>
<array>
<string>category</string>
<string>groups</string>
<string>icon</string>
<string>pkg_name</string>
<string>version</string>
<string>policy</string>
<string>template</string>
<string>scripts</string>
<string>icon</string>
</array>
<key>summary_text</key>
<string>The following changes were made to Jamf Pro:</string>
Expand Down
206 changes: 177 additions & 29 deletions AutoPkgr/Supporting Files/report.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,35 +233,183 @@ <h3>{{ munki_importer.summary_text }}</h3>
{{/ munki_importer.data_rows.count }}

<!-- Uploaded to Jamf Pro using JamfUploader -->
<!-- "report_fields": ["category", "groups", "icon", "pkg-name", "version", "policy", "template", "scripts"] -->
{{# jamfuploader.data_rows.count }}
<h3>{{ jamfuploader.summary_text }}</h3>
<table>
<tr>
<th>category</th>
<th>groups</th>
<th>icon</th>
<th>pkg_name</th>
<th>version</th>
<th>policy</th>
<th>template</th>
<th>scripts</th>
</tr>
{{# jamfuploader.data_rows }}
<tr>
<td>{{ category }}</td>
<td>{{ groups }}</td>
<td>{{ icon }}</td>
<td>{{ pkg_name }}</td>
<td>{{ version }}</td>
<td>{{ policy }}</td>
<td>{{ template }}</td>
<td>{{ scripts }}</td>
</tr>
{{/ jamfuploader.data_rows }}
</table>
{{/ jamfuploader.data_rows.count }}

{{# jamfcategoryuploader.data_rows.count }}
<h3>{{ jamfcategoryuploader.summary_text }}</h3>
<table>
<tr>
<th>category</th>
<th>priority</th>
</tr>
{{# jamfcategoryuploader.data_rows }}
<tr>
<td>{{ category }}</td>
<td>{{ priority }}</td>
</tr>
{{/ jamfcategoryuploader.data_rows }}
</table>
{{/ jamfcategoryuploader.data_rows.count }}

<!-- Uploaded to Jamf Pro using JamfUploader -->
{{# jamfcomputergroupuploader.data_rows.count }}
<h3>{{ jamfcomputergroupuploader.summary_text }}</h3>
<table>
<tr>
<th>group</th>
<th>template</th>
</tr>
{{# jamfcomputergroupuploader.data_rows }}
<tr>
<td>{{ group }}</td>
<td>{{ template }}</td>
</tr>
{{/ jamfcomputergroupuploader.data_rows }}
</table>
{{/ jamfcomputergroupuploader.data_rows.count }}

<!-- Uploaded to Jamf Pro using JamfUploader -->
{{# jamfdockitemuploader.data_rows.count }}
<h3>{{ jamfdockitemuploader.summary_text }}</h3>
<table>
<tr>
<th>dock_item_id</th>
<th>dock_item_name</th>
<th>dock_item_type</th>
<th>dock_item_path</th>
</tr>
{{# jamfdockitemuploader.data_rows }}
<tr>
<td>{{ dock_item_id }}</td>
<td>{{ dock_item_name }}</td>
<td>{{ dock_item_type }}</td>
<td>{{ dock_item_path }}</td>
</tr>
{{/ jamfdockitemuploader.data_rows }}
</table>
{{/ jamfdockitemuploader.data_rows.count }}

<!-- Uploaded to Jamf Pro using JamfUploader -->
{{# jamfextensionattributeuploader.data_rows.count }}
<h3>{{ jamfextensionattributeuploader.summary_text }}</h3>
<table>
<tr>
<th>name</th>
<th>path</th>
</tr>
{{# jamfextensionattributeuploader.data_rows }}
<tr>
<td>{{ name }}</td>
<td>{{ path }}</td>
</tr>
{{/ jamfextensionattributeuploader.data_rows }}
</table>
{{/ jamfextensionattributeuploader.data_rows.count }}

<!-- Uploaded to Jamf Pro using JamfUploader -->
<!-- "report_fields": ["pkg_path", "pkg_name", "version", "category"] -->
{{# jamfpackageuploader.data_rows.count }}
<h3>{{ jamfpackageuploader.summary_text }}</h3>
<table>
<tr>
<th>pkg_path</th>
<th>pkg_name</th>
<th>version</th>
<th>category</th>
</tr>
{{# jamfpackageuploader.data_rows }}
<tr>
<td>{{ pkg_path }}</td>
<td>{{ pkg_name }}</td>
<td>{{ version }}</td>
<td>{{ category }}</td>
</tr>
{{/ jamfpackageuploader.data_rows }}
</table>
{{/ jamfpackageuploader.data_rows.count }}

<!-- Uploaded to Jamf Pro using JamfUploader -->
{{# jamfpatchuploader.data_rows.count }}
<h3>{{ jamfpatchuploader.summary_text }}</h3>
<table>
<tr>
<th>patch_id</th>
<th>patch_policy_name</th>
<th>patch_softwaretitle</th>
<th>patch_version</th>
</tr>
{{# jamfpatchuploader.data_rows }}
<tr>
<td>{{ patch_id }}</td>
<td>{{ patch_policy_name }}</td>
<td>{{ patch_softwaretitle }}</td>
<td>{{ patch_version }}</td>
</tr>
{{/ jamfpatchuploader.data_rows }}
</table>
{{/ jamfpatchuploader.data_rows.count }}

<!-- Uploaded to Jamf Pro using JamfUploader -->
<!-- "report_fields": ["policy", "template", "icon"] -->
{{# jamfpolicyuploader.data_rows.count }}
<h3>{{ jamfpolicyuploader.summary_text }}</h3>
<table>
<tr>
<th>policy</th>
<th>template</th>
<th>icon</th>
</tr>
{{# jamfpolicyuploader.data_rows }}
<tr>
<td>{{ policy }}</td>
<td>{{ template }}</td>
<td>{{ icon }}</td>
</tr>
{{/ jamfpolicyuploader.data_rows }}
</table>
{{/ jamfpolicyuploader.data_rows.count }}

<!-- Uploaded to Jamf Pro using JamfUploader -->
{{# jamfscriptuploader.data_rows.count }}
<h3>{{ jamfscriptuploader.summary_text }}</h3>
<table>
<tr>
<th>script</th>
<th>path</th>
<th>category</th>
<th>priority</th>
<th>os_req</th>
<th>info</th>
<th>notes</th>
<th>P4</th>
<th>P5</th>
<th>P6</th>
<th>P7</th>
<th>P8</th>
<th>P9</th>
<th>P10</th>
<th>P11</th>
</tr>
{{# jamfscriptuploader.data_rows }}
<tr>
<td>{{ script }}</td>
<td>{{ path }}</td>
<td>{{ category }}</td>
<td>{{ priority }}</td>
<td>{{ os_req }}</td>
<td>{{ info }}</td>
<td>{{ notes }}</td>
<td>{{ P4 }}</td>
<td>{{ P5 }}</td>
<td>{{ P6 }}</td>
<td>{{ P7 }}</td>
<td>{{ P8 }}</td>
<td>{{ P9 }}</td>
<td>{{ P10 }}</td>
<td>{{ P11 }}</td>
</tr>
{{/ jamfscriptuploader.data_rows }}
</table>
{{/ jamfscriptuploader.data_rows.count }}

<!-- Imported to JSS (Casper) -->
<!-- "report_fields": ["Package", "Categories", "Groups", "Scripts", "Extension Attributes", "Policy", "Icon"] -->
{{# jss_importer.data_rows.count }}
Expand Down
Loading

0 comments on commit a40f6be

Please sign in to comment.