Skip to content

Update query to reference auditlog.Client API Actions #858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 2 commits into from
Aug 6, 2025
Merged

Update query to reference auditlog.Client API Actions #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc18897
Update query to reference auditlog.Client API Actions
labkey-adam Aug 4, 2025
6c1512b
Query "Client API Actions" audit event table directly and use modern …
labkey-adam Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions WNPRC_EHR/resources/queries/core/SiteBackupLog.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ EventType,
date,
comment

FROM auditlog.audit a

WHERE
a.key1 = 'LabKey Server Backup' AND
a.EventType = 'Client API Actions'
FROM auditlog."Client API Actions" a

WHERE a.SubType = 'LabKey Server Backup'
9 changes: 3 additions & 6 deletions WNPRC_EHR/src/org/labkey/wnprc_ehr/notification/AdminAlertsNotificationRevamp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
import org.labkey.api.data.SimpleFilter;
import org.labkey.api.data.Sort;
import org.labkey.api.module.Module;
import org.labkey.api.query.FieldKey;
import org.labkey.api.security.User;

import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
Expand Down Expand Up @@ -142,14 +140,13 @@ void getNumClientErrorsSinceYesterday() {
// Creates filter.
Date dateYesterday = dateToolkit.getDateXDaysFromNow(-1);
SimpleFilter myFilter = new SimpleFilter("date", dateYesterday, CompareType.DATE_GTE);
myFilter.addCondition("key1", "LabKey Server Backup", CompareType.NEQ_OR_NULL);
myFilter.addCondition("EventType", "Client API Actions", CompareType.EQUAL);
myFilter.addCondition("SubType", "LabKey Server Backup", CompareType.NEQ_OR_NULL);

// Runs query.
ArrayList<String> returnArray = notificationToolkit.getTableMultiRowSingleColumn(currentContainer, currentUser, "auditlog", "audit", myFilter, null, "RowId", null);
ArrayList<String> returnArray = notificationToolkit.getTableMultiRowSingleColumn(currentContainer, currentUser, "auditlog", "Client API Actions", myFilter, null, "RowId", null);
this.numClientErrorsSinceYesterday = Long.valueOf(returnArray.size());
// Creates a URL to view number of client errors since yesterday.
this.numClientErrorsSinceYesterdayURLView = notificationToolkit.createQueryURL(currentContainer, "execute", "auditlog", "audit", myFilter);
this.numClientErrorsSinceYesterdayURLView = notificationToolkit.createQueryURL(currentContainer, "execute", "auditlog", "Client API Actions", myFilter);
}
}
}
11 changes: 3 additions & 8 deletions WNPRC_EHR/src/org/labkey/wnprc_ehr/notification/SiteErrorAlertsRevamp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ public String getCategory() {
return "Revamped Notifications";
}





//Message Creation
@Override
public String getMessageBodyHTML(Container c, User u) {
Expand All @@ -69,13 +65,13 @@ public String getMessageBodyHTML(Container c, User u) {

// Creates filter.
SimpleFilter myFilter = new SimpleFilter("date", lastRunDate, CompareType.GTE);
myFilter.addCondition("key1", "LabKeyServer Backup", CompareType.NEQ);
myFilter.addCondition("SubType", "LabKeyServer Backup", CompareType.NEQ);
// Gets columns to retrieve.
String[] targetColumns = new String[]{"id"};
// Runs query.
ArrayList<HashMap<String, String>> returnArray = notificationToolkit.getTableMultiRowMultiColumnWithFieldKeys(c, u, "auditlog", "audit", myFilter, null, targetColumns);
ArrayList<HashMap<String, String>> returnArray = notificationToolkit.getTableMultiRowMultiColumnWithFieldKeys(c, u, "auditlog", "Client API Actions", myFilter, null, targetColumns);
// Creates URL.
String queryURL = notificationToolkit.createQueryURL(c, "execute", "auditlog", "audit", myFilter);
String queryURL = notificationToolkit.createQueryURL(c, "execute", "auditlog", "Client API Actions", myFilter);

// Sends the message only if there are results (otherwise sends notification to admins via emptyNotificationRevamp).
if (returnArray.isEmpty()) {
Expand All @@ -89,7 +85,6 @@ public String getMessageBodyHTML(Container c, User u) {
return messageBody.toString();
}
}

}


Expand Down
2 changes: 1 addition & 1 deletion docker/ehrcron/scripts/pg_backup/lkServerBackup.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ sub lk_log {
-queryName => "Client API Actions",
-rows =>
[ {
"Key1" => "LabKey Server Backup",
"SubType" => "LabKey Server Backup",
"Comment" => $status,
"Date" => $date
} ]
Expand Down