Status dashboard / Don't include indexing warnings as errors

Author: josegar74

healthmonitor/src/main/java/org/fao/geonet/monitor/health/NoIndexErrorsHealthCheck.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2023 Food and Agriculture Organization of the
+ * Copyright (C) 2001-2024 Food and Agriculture Organization of the
  * United Nations (FAO-UN), United Nations World Food Programme (WFP)
  * and United Nations Environment Programme (UNEP)
  *
@@ -44,7 +44,8 @@ protected Result check() throws Exception {
                 GeonetContext gc = (GeonetContext) context.getHandlerContext(Geonet.CONTEXT_NAME);
 
                 EsSearchManager searchMan = gc.getBean(EsSearchManager.class);
-                long numDocs = searchMan.getNumDocs("+" + IndexFields.INDEXING_ERROR_FIELD + ":true");
+                long numDocs = searchMan.getNumDocs("-" + IndexFields.INDEXING_ERROR_MSG + ".type:warning +" +
+                    IndexFields.INDEXING_ERROR_FIELD + ":true");
 
                 if (numDocs > 0) {
                     return Result.unhealthy(String.format("Found %d metadata that had errors during indexing", numDocs));

web-ui/src/main/resources/catalog/js/admin/DashboardStatusController.js

@@ -67,6 +67,7 @@
       $scope.threadSortReverse = false;
       $scope.threadInfoLoading = false;
       $scope.hasIndexingError = false;
+      $scope.hasIndexingWarning = false;
 
       $scope.indexStatus = null;
       function getIndexStatus() {
@@ -76,21 +77,77 @@
       }
       getIndexStatus();
 
-      function getRecordsWithIndexingErrors() {
+      function getRecords(queryFilter) {
         return $http.post("../api/search/records/_search?bucket=ie", {
-          query: {
-            bool: {
-              must: { terms: { indexingError: [true] } }
-            }
-          },
+          query: queryFilter,
           from: 0,
           size: 0
         });
       }
-      getRecordsWithIndexingErrors().then(function (r) {
+
+      /**
+       * Get the metadata that have indexing errors (including warnings).
+       *
+       * @returns {*}
+       */
+      function getRecordsWithIndexingErrors() {
+        return getRecords({
+          bool: {
+            must: { terms: { indexingError: [true] } }
+          }
+        });
+      }
+
+      /**
+       * Get the metadata that have indexing errors (excluding warnings)
+       *
+       * @returns {*}
+       */
+      function getRecordsWithIndexingErrorsNoWarnings() {
+        return getRecords({
+          bool: {
+            must: [
+              {
+                query_string: {
+                  query: "(-indexingErrorMsg.type:warning)",
+                  default_operator: "AND"
+                }
+              },
+              { terms: { indexingError: [true] } }
+            ]
+          }
+        });
+      }
+
+      getRecordsWithIndexingErrorsNoWarnings().then(function (r) {
         $scope.hasIndexingError = r.data.hits.total.value > 0;
       });
 
+      /**
+       * Get the metadata that have indexing warnings.
+       *
+       * @returns {*}
+       */
+      function getRecordsWithIndexingWarnings() {
+        return getRecords({
+          bool: {
+            must: [
+              {
+                query_string: {
+                  query: "(+indexingErrorMsg.type:warning)",
+                  default_operator: "AND"
+                }
+              },
+              { terms: { indexingError: [true] } }
+            ]
+          }
+        });
+      }
+
+      getRecordsWithIndexingWarnings().then(function (r) {
+        $scope.hasIndexingWarning = r.data.hits.total.value > 0;
+      });
+
       $scope.setThreadSortField = function (field) {
         if (field === $scope.threadSortField) {
           $scope.threadSortReverse = !$scope.threadSortReverse;
@@ -270,7 +327,7 @@
         configId: "recordsWithErrors",
         selectionBucket: "ies",
         defaultParams: {
-          "indexingErrorMsg.type": "warning",
+          "indexingErrorMsg.type": ["warning", "error"],
           sortBy: "changeDate",
           sortOrder: "desc"
         }

web-ui/src/main/resources/catalog/locales/en-admin.json

@@ -445,8 +445,7 @@
     "metadataIdentifierTemplateDeletedError": "An error occurred deleting the Metadata identifier template",
     "metadataInternalId": "Choose a metadata internal identifier",
     "metadataStatus": "Metadata information",
-    "metadataWithIndexingErrors": "Metadata with indexing errors",
-    "indexRecordsWithErrors": "Index records with errors",
+    "metadataWithIndexingErrors": "Metadata with indexing errors / warnings",
     "top10IndexingErrors": "Top 10 indexing errors:",
     "metadataErrorReport": "Error report",
     "moreExamples": "More examples",

web-ui/src/main/resources/catalog/locales/en-v4.json

@@ -150,7 +150,7 @@
   "isPublishedToAll-false": "Restricted records",
   "dateTypeForStatus": "Date type",
   "dateValueForStatus": "Date",
-  "indexRecordsWithErrors": "Index records with errors",
+  "indexRecordsWithErrors": "Index records with errors / warnings",
   "top10IndexingErrors": "Top 10 indexing errors:",
   "facet-indexingErrorMsg": "Indexing errors",
   "facet-indexingWarningMsg": "Indexing warnings",

web-ui/src/main/resources/catalog/templates/admin/dashboard/status.html

@@ -148,10 +148,13 @@ <h4 class="list-group-item-heading" translate>{{info.name}}</h4>
         class="form-horizontal"
         role="form"
         data-ng-search-form=""
-        data-ng-if="hasIndexingError"
+        data-ng-if="hasIndexingError || hasIndexingWarning"
         data-runSearch="true"
       >
-        <div class="panel panel-default panel-danger">
+        <div
+          class="panel panel-default"
+          data-ng-class="hasIndexingError ? 'panel-danger' : 'panel-warning'"
+        >
           <div class="panel-heading">
             <span data-translate="">metadataWithIndexingErrors</span>