diff --git a/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get.html.ftl b/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get.html.ftl index 88c5dcd..26b3a31 100644 --- a/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get.html.ftl +++ b/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get.html.ftl @@ -45,50 +45,56 @@ Copyright (C) 2005 - 2020 Alfresco Software Limited. <#if coreLabel == "solr-tracking.section." + coreName + ".title"> <#assign coreLabel= msg("solr-tracking.section.genericCore.title", coreName) /> - <@section label=coreLabel /> + + +
<@field value="${trackingStatus[coreName]['index']['numDocs']?c}" label=msg("solr-tracking.section.numdocs.title") description=msg("solr-tracking.section.numdocs.description") /> <@field value="${trackingStatus[coreName]['index']['deletedDocs']?c}" label=msg("solr-tracking.section.deleted.title") description=msg("solr-tracking.section.deleted.description") /> - <@field value="${trackingSummary[coreName]['TX Lag']}" label=msg("solr-tracking.section.index.lag.title") description=msg("solr-tracking.section.index.lag.description")/> - <@field value="${iecBinaryUnitSize(trackingStatus[coreName]['index']['sizeInBytes'])}" label=msg("solr-tracking.section.disk.usage.title") description=msg("solr-tracking.section.disk.usage.description") /> -
- -
- <@field value="${trackingStatus[coreName]['index']['maxDoc']?c}" label=msg("solr-tracking.section.maxdocs.title") description=msg("solr-tracking.section.maxdocs.description") /> - <@field value="${trackingSummary[coreName]['Id for last TX in index']?c}" label=msg("solr-tracking.section.last.transaction.title") description=msg("solr-tracking.section.last.transaction.description") /> - <@field value="${trackingSummary[coreName]['Approx transaction indexing time remaining']}" label=msg("solr-tracking.section.approx.time.title") description=msg("solr-tracking.section.approx.time.description") /> - <#if trackingStatus[coreName]['index']['indexHeapUsageBytes'] != -1> <@field value="${iecBinaryUnitSize(trackingStatus[coreName]['index']['indexHeapUsageBytes'])}" label=msg("solr-tracking.section.memory.usage.title") description=msg("solr-tracking.section.memory.usage.description")/>
+ +
+ <@field value="${trackingStatus[coreName]['index']['maxDoc']?c}" label=msg("solr-tracking.section.maxdocs.title") description=msg("solr-tracking.section.maxdocs.description") /> + <@field value="${iecBinaryUnitSize(trackingStatus[coreName]['index']['sizeInBytes'])}" label=msg("solr-tracking.section.disk.usage.title") description=msg("solr-tracking.section.disk.usage.description") /> +
+ <#-- reset after uneven field count -->
- <#assign coreDetailLabel= msg("solr-tracking.section." + coreName + ".detail.title") /> - <#if coreDetailLabel == "solr-tracking.section." + coreName + ".detail.title"> - <#assign coreDetailLabel= msg("solr-tracking.section.genericCore.detail.title", coreName) /> - - <@section label=coreDetailLabel />
<@field value="${trackingSummary[coreName]['MetadataTracker Active']?string(msg('solr-tracking.true'), msg('solr-tracking.false'))}" label=msg("solr-tracking.section.detail.metadata.title") description=msg("solr-tracking.section.detail.metadata.description")/> - <@field value="${trackingSummary[coreName]['ContentTracker Active']?string(msg('solr-tracking.true'), msg('solr-tracking.false'))}" label=msg("solr-tracking.section.detail.content.title") description=msg("solr-tracking.section.detail.content.description")/> + <@field value="${trackingSummary[coreName]['Approx transactions remaining']?c}" label=msg("solr-tracking.section.detail.metadata.count.title") description=msg("solr-tracking.section.detail.metadata.count.description") /> + <@field value="${trackingSummary[coreName]['Approx transaction indexing time remaining']}" label=msg("solr-tracking.section.approx.time.title") description=msg("solr-tracking.section.approx.time.description") /> +
+ +
+ <@field value="${trackingSummary[coreName]['Id for last TX in index']?c}" label=msg("solr-tracking.section.last.transaction.title") description=msg("solr-tracking.section.last.transaction.description") /> + <@field value="${trackingSummary[coreName]['TX Lag']}" label=msg("solr-tracking.section.index.lag.title") description=msg("solr-tracking.section.index.lag.description")/> +
+
+ + <#-- reset after uneven field count --> +
+
<@field value="${trackingSummary[coreName]['AclTracker Active']?string(msg('solr-tracking.true'), msg('solr-tracking.false'))}" label=msg("solr-tracking.section.detail.acl.title") description=msg("solr-tracking.section.detail.acl.description")/> + <@field value="${trackingSummary[coreName]['ContentTracker Active']?string(msg('solr-tracking.true'), msg('solr-tracking.false'))}" label=msg("solr-tracking.section.detail.content.title") description=msg("solr-tracking.section.detail.content.description")/> <@field value="${(cascadeTracker[coreName] > 0)?string(msg('solr-tracking.true'), msg('solr-tracking.false'))}" label=msg("solr-tracking.section.detail.cascade.title") description=msg("solr-tracking.section.detail.cascade.description")/>
+
- <@field value="${trackingSummary[coreName]['Approx transactions remaining']?c}" label=msg("solr-tracking.section.detail.metadata.count.title") description=msg("solr-tracking.section.detail.metadata.count.description") /> + <@field value="${trackingSummary[coreName]['Approx change sets remaining']?c}" label=msg("solr-tracking.section.detail.acl.count.title") description=msg("solr-tracking.section.detail.acl.count.description") /> <#if trackingSummary[coreName]['FTS']['Node count whose content needs to be updated']?has_content> <@field value="${trackingSummary[coreName]['FTS']['Node count whose content needs to be updated']?c}" label=msg("solr-tracking.section.detail.content.count.title") description=msg("solr-tracking.section.detail.content.count.description")/> <#else> <@field value="${(trackingSummary[coreName]['FTS']['Node count with FTSStatus New'] + trackingSummary[coreName]['FTS']['Node count with FTSStatus Dirty'])?c}" label=msg("solr-tracking.section.detail.content.count.title") description=msg("solr-tracking.section.detail.content.count.description")/> - <@field value="${trackingSummary[coreName]['Approx change sets remaining']?c}" label=msg("solr-tracking.section.detail.acl.count.title") description=msg("solr-tracking.section.detail.acl.count.description") /> <@field value="${cascadeTracker[coreName]?c}" label=msg("solr-tracking.section.detail.cascade.count.title") description=msg("solr-tracking.section.detail.cascade.count.description") />
-
- + \ No newline at end of file diff --git a/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get.properties b/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get.properties index a78bdc6..5b0ef58 100644 --- a/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get.properties +++ b/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get.properties @@ -22,12 +22,9 @@ solr-tracking.section.disk.usage.description=Disk space used by the latest versi solr-tracking.section.index.lag.title=Index Lag solr-tracking.section.index.lag.description=Time that indexing is currently behind the repository updates. -solr-tracking.section.approx.transaction.title=Approx Transaction To Index -solr-tracking.section.approx.transaction.description=Estimated number of outstanding transactions that require indexing. solr-tracking.section.memory.usage.title=Memory Usage solr-tracking.section.memory.usage.description=Current memory usage. Note: This value may vary due to transient memory used by background processing. The value does not include Lucene related caches. -solr-tracking.section.detail.title=Detailed Tracking Status solr-tracking.section.detail.metadata.title=Metadata Tracker in Progress solr-tracking.section.detail.metadata.description=Search is retrieving nodes and properties from Repository. solr-tracking.section.detail.content.title=Content Tracker in Progress diff --git a/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_de.properties b/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_de.properties index 99bf0f5..f830cb8 100644 --- a/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_de.properties +++ b/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_de.properties @@ -25,9 +25,6 @@ solr-tracking.section.index.lag.description=Die aktuelle Zeit um welche die Inde solr-tracking.section.memory.usage.title=Speichernutzung solr-tracking.section.memory.usage.description=Die aktuelle Speichernutzung als Teil des Java Virtual Machine Heaps. Dieser Wert kann je nach aktiven Hintergrundprozessen schwanken und ber\u00fccksichtigt nicht die Caches auf Ebene der Lucene-Engine. -solr-tracking.section.alfresco.detail.title=Tracking-Status Haupt-Arbeitsbereich -solr-tracking.section.archive.detail.title=Tracking-Status Archiv / Papierkorb -solr-tracking.section.genericCore.detail.title=Tracking-Status von {0} solr-tracking.section.detail.metadata.title=Metadata Tracker aktiv solr-tracking.section.detail.metadata.description=Knoten und Metadaten werden indexiert. solr-tracking.section.detail.content.title=Content Tracker aktiv diff --git a/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_en.properties b/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_en.properties index 5355c92..5b0ef58 100644 --- a/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_en.properties +++ b/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_en.properties @@ -25,9 +25,6 @@ solr-tracking.section.index.lag.description=Time that indexing is currently behi solr-tracking.section.memory.usage.title=Memory Usage solr-tracking.section.memory.usage.description=Current memory usage. Note: This value may vary due to transient memory used by background processing. The value does not include Lucene related caches. -solr-tracking.section.alfresco.detail.title=Workspace Store Detailed Tracking Status -solr-tracking.section.archive.detail.title=Archive Store Detailed Tracking Status -solr-tracking.section.genericCore.detail.title=Core {0} Detailed Tracking Status solr-tracking.section.detail.metadata.title=Metadata Tracker in Progress solr-tracking.section.detail.metadata.description=Search is retrieving nodes and properties from Repository. solr-tracking.section.detail.content.title=Content Tracker in Progress diff --git a/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_es.properties b/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_es.properties index 9f6b15f..be5b6c4 100644 --- a/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_es.properties +++ b/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_es.properties @@ -25,9 +25,6 @@ solr-tracking.section.index.lag.description=Tiempo de retraso actual de la index solr-tracking.section.memory.usage.title=Uso de memoria solr-tracking.section.memory.usage.description=Uso de memoria actual. Nota: este valor puede variar debido al uso de memoria transitoria en el procesamiento en un segundo plano. El valor no incluye cach\u00e9s relacionadas con Lucene. -solr-tracking.section.alfresco.detail.title=Estado de seguimiento detallado del almac\u00e9n principal -solr-tracking.section.archive.detail.title=Estado de seguimiento detallado del almac\u00e9n de archivos -solr-tracking.section.genericCore.detail.title=Estado de seguimiento detallado del almac\u00e9n {0} solr-tracking.section.detail.metadata.title=Metadata Tracker en curso solr-tracking.section.detail.metadata.description=Search est\u00e1 recuperando nodos y propiedades del Repositorio. solr-tracking.section.detail.content.title=Content Tracker en curso diff --git a/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_pt.properties b/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_pt.properties index 815519f..1f8737f 100644 --- a/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_pt.properties +++ b/repository/src/main/resources/alfresco/templates/webscripts/org/orderofthebee/support-tools/admin/ootbee-support-tools/solr-tracking.get_pt.properties @@ -25,9 +25,6 @@ solr-tracking.section.index.lag.description=O tempo que a indexa\u00e7\u00e3o es solr-tracking.section.memory.usage.title=Uso de mem\u00f3ria solr-tracking.section.memory.usage.description=Uso atual de mem\u00f3ria. Observa\u00e7\u00e3o: Este valor pode variar devido ao uso de mem\u00f3ria transit\u00f3ria no processamento. O valor n\u00e3o inclui caches relacionados ao Lucene. -solr-tracking.section.alfresco.detail.title=Workspace Store Detailed Tracking Status -solr-tracking.section.archive.detail.title=Archive Store Detailed Tracking Status -solr-tracking.section.genericCore.detail.title=Core {0} Detailed Tracking Status solr-tracking.section.detail.metadata.title=Metadata Tracker in Progress solr-tracking.section.detail.metadata.description=Search is retrieving nodes and properties from Repository. solr-tracking.section.detail.content.title=Content Tracker in Progress