diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationFramework.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationFramework.java
index 2c3b0331b6e..ee382b36959 100644
--- a/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationFramework.java
+++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationFramework.java
@@ -55,14 +55,27 @@ public final class AuthorizationFramework extends PluginFramework<IAuthorization
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AuthorizationFramework.class);
 
-    private final Counter authStackReloadCounter = Metrics.getRegistry().counter("authorization_stack_reload");
-    private final Counter authCacheHits = Metrics.getRegistry().counter("authorization_cache_hits");
-    private final Counter authCacheMisses = Metrics.getRegistry().counter("authorization_cache_misses");
-    private final Counter authSessionsInvalidated = Metrics.getRegistry().counter("authorization_sessions_invalidated");
-
-    private final Timer authTimer = Metrics.getRegistry().timer("authorization");
-    private final Timer authPositiveTimer = Metrics.getRegistry().timer("authorization_positive");
-    private final Timer authNegativeTimer = Metrics.getRegistry().timer("authorization_negative");
+    private final Counter authStackReloadCounter = Metrics.getRegistry().
+            counter("authorization.stack.reload");
+    private final Counter authCacheHits = Counter.builder("authorization.cache").
+            description("authorization cache hits").
+            tag("what", "hits").
+            register(Metrics.getRegistry());
+    private final Counter authCacheMisses = Counter.builder("authorization.cache").
+            description("authorization cache misses").
+            tag("what", "misses").
+            register(Metrics.getRegistry());
+    private final Counter authSessionsInvalidated = Metrics.getRegistry().
+            counter("authorization.sessions.invalidated");
+
+    private final Timer authTimerPositive = Timer.builder("authorization.latency").
+            description("authorization latency").
+            tag("outcome", "positive").
+            register(Metrics.getRegistry());
+    private final Timer authTimerNegative = Timer.builder("authorization.latency").
+            description("authorization latency").
+            tag("outcome", "negative").
+            register(Metrics.getRegistry());
 
     /**
      * Stack of available plugins/stacks in the order of the execution.
@@ -537,11 +550,10 @@ private boolean checkAll(HttpServletRequest request, String cache, Nameable enti
         }
 
         // Update the timers.
-        authTimer.record(duration);
         if (overallDecision) {
-            authPositiveTimer.record(duration);
+            authTimerPositive.record(duration);
         } else {
-            authNegativeTimer.record(duration);
+            authTimerNegative.record(duration);
         }
 
         m.put(entity.getName(), overallDecision);
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/WatchDogService.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/WatchDogService.java
index 555bdf4f5dd..51c6439f47c 100644
--- a/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/WatchDogService.java
+++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/WatchDogService.java
@@ -141,6 +141,6 @@ public void stop() {
                 LOGGER.log(Level.WARNING, "Cannot join WatchDogService thread: ", ex);
             }
         }
-        LOGGER.log(Level.INFO, "Watchdog stoped");
+        LOGGER.log(Level.INFO, "Watchdog stopped");
     }
 }
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java
index 63455ffdfda..c412984aa34 100644
--- a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java
+++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.indexer.framework;
@@ -56,7 +56,8 @@ public class PluginClassLoader extends ClassLoader {
             "org.opengrok.indexer.authorization.plugins.*",
             "org.opengrok.indexer.authorization.AuthorizationException",
             "org.opengrok.indexer.util.*",
-            "org.opengrok.indexer.logger.*"
+            "org.opengrok.indexer.logger.*",
+            "org.opengrok.indexer.Metrics"
     };
 
     private static final String[] PACKAGE_BLACKLIST = new String[]{
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/SearchEngine.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/SearchEngine.java
index 87217f3858b..7e204897bb6 100644
--- a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/SearchEngine.java
+++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/SearchEngine.java
@@ -18,7 +18,7 @@
  */
 
  /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2018, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.indexer.search;
@@ -73,9 +73,8 @@
 import org.opengrok.indexer.web.ProjectHelper;
 
 /**
- * This is an encapsulation of the details on how to search in the index
- * database.
- * This is used for searching from the command line tool and also via the JSON interface.
+ * This is an encapsulation of the details on how to search in the index database.
+ * This is used for searching via the REST API.
  *
  * @author Trond Norbye 2005
  * @author Lubos Kosco - upgrade to lucene 3.x, 4.x, 5.x
diff --git a/opengrok-indexer/src/test/java/org/opengrok/indexer/authorization/AuthorizationFrameworkReloadTest.java b/opengrok-indexer/src/test/java/org/opengrok/indexer/authorization/AuthorizationFrameworkReloadTest.java
index f45222295b2..3b504f55e9c 100644
--- a/opengrok-indexer/src/test/java/org/opengrok/indexer/authorization/AuthorizationFrameworkReloadTest.java
+++ b/opengrok-indexer/src/test/java/org/opengrok/indexer/authorization/AuthorizationFrameworkReloadTest.java
@@ -146,7 +146,7 @@ public void run() {
         }
 
         // Double check that at least one reload() was done.
-        long reloads = (long) Metrics.getRegistry().counter("authorization_stack_reload").count();
+        long reloads = (long) Metrics.getRegistry().counter("authorization.stack.reload").count();
         assertTrue(reloads > 0);
     }
 
diff --git a/plugins/src/main/java/opengrok/auth/plugin/ldap/LdapFacade.java b/plugins/src/main/java/opengrok/auth/plugin/ldap/LdapFacade.java
index 908198d2881..56cd5596c68 100644
--- a/plugins/src/main/java/opengrok/auth/plugin/ldap/LdapFacade.java
+++ b/plugins/src/main/java/opengrok/auth/plugin/ldap/LdapFacade.java
@@ -22,6 +22,8 @@
  */
 package opengrok.auth.plugin.ldap;
 
+import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -41,9 +43,11 @@
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
+import io.micrometer.core.instrument.Timer;
 import opengrok.auth.plugin.configuration.Configuration;
 import opengrok.auth.plugin.util.WebHook;
 import opengrok.auth.plugin.util.WebHooks;
+import org.opengrok.indexer.Metrics;
 
 public class LdapFacade extends AbstractLdapProvider {
 
@@ -103,6 +107,10 @@ public class LdapFacade extends AbstractLdapProvider {
     private long errorTimestamp = 0;
     private boolean reported = false;
 
+    private final Timer ldapLookupTimer = Timer.builder("ldap.latency").
+            description("LDAP lookup latency").
+            register(Metrics.getRegistry());
+
     /**
      * Interface for converting LDAP results into user defined types.
      *
@@ -290,7 +298,10 @@ public SearchControls getSearchControls() {
      * @return results transformed with mapper
      */
     private <T> LdapSearchResult<T> lookup(String dn, String filter, String[] attributes, AttributeMapper<T> mapper) throws LdapException {
-        return lookup(dn, filter, attributes, mapper, 0);
+        Instant start = Instant.now();
+        LdapSearchResult<T> res = lookup(dn, filter, attributes, mapper, 0);
+        ldapLookupTimer.record(Duration.between(start, Instant.now()));
+        return res;
     }
 
     private String getSearchDescription(String dn, String filter, String[] attributes) {