UI: Adding Elasticsearch Ignore parameter in Configurator #1388

dcm4che · May 11, 2018 · ba621bc · ba621bc
1 parent 8973905
commit ba621bc
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 3 deletions.
diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/schema/dcm4chee-archive-ui.schema b/dcm4chee-arc-assembly/src/main/resources/ldap/schema/dcm4chee-archive-ui.schema
@@ -118,6 +118,11 @@ attributetype ( 1.2.40.0.13.1.15.111.3.20 NAME 'dicomuiDeviceName'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
+attributetype ( 1.2.40.0.13.1.15.111.3.20 NAME 'dicomuiIgnoreParams'
+  DESC 'Device Names for UI Dashboard Configuration'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
 attributetype ( 1.2.40.0.13.1.15.111.3.21 NAME 'dcmuiCountAET'
   DESC 'UI Dashboard Count AET'
   EQUALITY caseExactIA5Match
@@ -205,7 +210,8 @@ objectclass ( 1.2.40.0.13.1.15.111.4.5 NAME 'dcmuiDashboardConfig'
   MAY (
     dcmuiQueueName $
     dcmuiCountAET $
-    dicomuiDeviceName ) )
+    dicomuiDeviceName $
+    dicomuiIgnoreParams ) )
 
 objectclass ( 1.2.40.0.13.1.15.111.4.6 NAME 'dcmuiElasticsearchConfig'
     DESC 'UI Configuration for Elasticsearch'

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-ui-modify.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-ui-modify.ldif
@@ -105,6 +105,10 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.20 NAME 'dicomuiDeviceName'
   DESC 'Device Names for UI Dashboard Configuration'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.27 NAME 'dicomuiIgnoreParams'
+  DESC 'Dashboard Ignore params'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.21 NAME 'dcmuiCountAET'
   DESC 'UI Dashboard Count AET'
   EQUALITY caseExactIA5Match
@@ -186,7 +190,8 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.111.4.5 NAME 'dcmuiDashboardConfig'
   MAY (
     dcmuiQueueName $
     dcmuiCountAET $
-    dicomuiDeviceName ) )
+    dicomuiDeviceName $
+    dicomuiIgnoreParams ) )
 olcObjectClasses: ( 1.2.40.0.13.1.15.111.4.6 NAME 'dcmuiElasticsearchConfig'
     DESC 'UI Configuration for Elasticsearch'
     SUP top STRUCTURAL

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-ui.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-ui.ldif
@@ -102,6 +102,10 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.20 NAME 'dicomuiDeviceName'
   DESC 'Device Names for UI Dashboard Configuration'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.27 NAME 'dicomuiIgnoreParams'
+  DESC 'Dashboard Ignore params'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.21 NAME 'dcmuiCountAET'
   DESC 'UI Dashboard Count AET'
   EQUALITY caseExactIA5Match
@@ -179,7 +183,8 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.111.4.5 NAME 'dcmuiDashboardConfig'
   MAY (
     dcmuiQueueName $
     dcmuiCountAET $
-    dicomuiDeviceName ) )
+    dicomuiDeviceName $
+    dicomuiIgnoreParams ) )
 olcObjectClasses: ( 1.2.40.0.13.1.15.111.4.6 NAME 'dcmuiElasticsearchConfig'
     DESC 'UI Configuration for Elasticsearch'
     SUP top STRUCTURAL

diff --git a/dcm4chee-arc-conf-ui/src/main/java/org/dcm4chee/arc/conf/ui/UIDashboardConfig.java b/dcm4chee-arc-conf-ui/src/main/java/org/dcm4chee/arc/conf/ui/UIDashboardConfig.java
@@ -48,6 +48,7 @@ public class UIDashboardConfig {
     private String[] queueNames = {};
     private String[] deviceNames = {};
     private String countAet;
+    private String[] ignoreParams = {};
 
     public UIDashboardConfig() {
     }
@@ -83,4 +84,12 @@ public void setDeviceNames(String[] deviceNames) {
     public String getCountAet() { return countAet; }
 
     public void setCountAet(String countAet) { this.countAet = countAet; }
+
+    public String[] getIgnoreParams() {
+        return ignoreParams;
+    }
+
+    public void setIgnoreParams(String[] ignoreParams) {
+        this.ignoreParams = ignoreParams;
+    }
 }
diff --git a/...e-arc-conf-ui/src/main/java/org/dcm4chee/arc/conf/ui/json/JsonArchiveUIConfiguration.java b/...e-arc-conf-ui/src/main/java/org/dcm4chee/arc/conf/ui/json/JsonArchiveUIConfiguration.java
@@ -182,6 +182,7 @@ private void writeUIDashboardConfigs(JsonWriter writer, Collection<UIDashboardCo
             writer.writeNotNullOrDef("dcmuiDashboardConfigName", uiDashboardConfig.getName(), null);
             writer.writeNotEmpty("dcmuiQueueName", uiDashboardConfig.getQueueNames());
             writer.writeNotEmpty("dicomuiDeviceName", uiDashboardConfig.getDeviceNames());
+            writer.writeNotEmpty("dicomuiIgnoreParams", uiDashboardConfig.getIgnoreParams());
             writer.writeNotNullOrDef("dcmuiCountAET", uiDashboardConfig.getCountAet(),null);
             writer.writeEnd();
         }
@@ -407,6 +408,9 @@ private void loadUIDashboardConfigs(UIConfig uiConfig, JsonReader reader) {
                     case "dicomuiDeviceName":
                         uiDashboardConfig.setDeviceNames(reader.stringArray());
                         break;
+                    case "dicomuiIgnoreParams":
+                        uiDashboardConfig.setIgnoreParams(reader.stringArray());
+                        break;
                     case "dcmuiCountAET":
                         uiDashboardConfig.setCountAet(reader.stringValue());
                         break;

diff --git a/...e-arc-conf-ui/src/main/java/org/dcm4chee/arc/conf/ui/ldap/LdapArchiveUIConfiguration.java b/...e-arc-conf-ui/src/main/java/org/dcm4chee/arc/conf/ui/ldap/LdapArchiveUIConfiguration.java
@@ -177,6 +177,7 @@ private Attributes storeTo(ConfigurationChanges.ModifiedObject ldapObj, UIDashbo
         attrs.put(new BasicAttribute("dcmuiDashboardConfigName", uiDashboardConfig.getName()));
         LdapUtils.storeNotEmpty(ldapObj, attrs, "dcmuiQueueName", uiDashboardConfig.getQueueNames());
         LdapUtils.storeNotEmpty(ldapObj, attrs, "dicomuiDeviceName", uiDashboardConfig.getDeviceNames());
+        LdapUtils.storeNotEmpty(ldapObj, attrs, "dicomuiIgnoreParams", uiDashboardConfig.getIgnoreParams());
         LdapUtils.storeNotNullOrDef(ldapObj, attrs,"dcmuiCountAET",uiDashboardConfig.getCountAet(),null);
         return attrs;
     }
@@ -324,6 +325,7 @@ private void loadDashboardConfigs(UIConfig uiConfig, String uiConfigDN) throws N
                 uiDashboardConfig.setCountAet(LdapUtils.stringValue(attrs.get("dcmuiCountAET"),null));
                 uiDashboardConfig.setQueueNames(LdapUtils.stringArray(attrs.get("dcmuiQueueName")));
                 uiDashboardConfig.setDeviceNames(LdapUtils.stringArray(attrs.get("dicomuiDeviceName")));
+                uiDashboardConfig.setIgnoreParams(LdapUtils.stringArray(attrs.get("dicomuiIgnoreParams")));
                 uiConfig.addDashboardConfig(uiDashboardConfig);
             }
         } finally {
@@ -569,6 +571,9 @@ private List<ModificationItem> storeDiffs(ConfigurationChanges.ModifiedObject ld
         LdapUtils.storeDiff(ldapObj, mods, "dicomuiDeviceName",
                 prev.getDeviceNames(),
                 uiDashboardConfig.getDeviceNames());
+        LdapUtils.storeDiff(ldapObj, mods, "dicomuiIgnoreParams",
+                prev.getIgnoreParams(),
+                uiDashboardConfig.getIgnoreParams());
         LdapUtils.storeDiffObject(ldapObj, mods,"dcmuiCountAET",
                 prev.getCountAet(),
                 uiDashboardConfig.getCountAet(), null);

diff --git a/dcm4chee-arc-ui2/src/assets/schema/uiDashboard.schema.json b/dcm4chee-arc-ui2/src/assets/schema/uiDashboard.schema.json
@@ -25,6 +25,12 @@
       "items" : { "type": "string" },
       "format": "dicomDeviceName"
     },
+    "dicomuiIgnoreParams": {
+      "title": "Audit Events Ignore Parameters",
+      "description": "Set Elasticsearch parameters that should be ignored in the Audit Events. E.g. Source.UserID=TESTVALUE",
+      "type": "array",
+      "items" : { "type": "string" }
+    },
     "dcmuiCountAET": {
       "title": "Count Aet",
       "description": "Selected Aet will be used to get the count of studies in the dashboard",