WIP for #670

Author: oharsta

myconext-server/src/main/java/myconext/api/MetricsController.java

@@ -1,19 +1,39 @@
 package myconext.api;
 
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.instrument.MeterRegistry;
 import io.swagger.v3.oas.annotations.Hidden;
+import myconext.model.IdpScoping;
 import myconext.repository.MetricsRepository;
 import myconext.repository.UserRepository;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.stream.Stream;
+
 @RestController
 @Hidden
 public class MetricsController {
 
-    private final UserRepository userRepository;
-    private final MetricsRepository metricsRepository;
+    public MetricsController(UserRepository userRepository,
+                             MetricsRepository metricsRepository,
+                             MeterRegistry meterRegistry) {
+        Gauge.builder("user_count", () -> userRepository.count())
+                .description("User count")
+                .register(meterRegistry);
+
+        Gauge.builder("linked_account_count", () -> metricsRepository.countTotalLinkedAccounts())
+                .description("Internal linked account count")
+                .register(meterRegistry);
 
-    public MetricsController(UserRepository userRepository, MetricsRepository metricsRepository) {
-        this.userRepository = userRepository;
-        this.metricsRepository = metricsRepository;
+        Gauge.builder("registered_apps_count", () -> metricsRepository.countTotalRegisteredApps())
+                .description("Registered apps count")
+                .register(meterRegistry);
+
+        Stream.of(IdpScoping.values())
+                .forEach(idpScoping -> Gauge
+                        .builder("external_linked_account_" + idpScoping.name(), () -> metricsRepository.countTotalExternalLinkedAccountsByType(idpScoping))
+                        .description("External account " + idpScoping.name() + " count ")
+                        .register(meterRegistry));
     }
+
 }

myconext-server/src/main/java/myconext/repository/MetricsRepository.java

@@ -1,16 +1,13 @@
 package myconext.repository;
 
 import com.mongodb.client.AggregateIterable;
-import myconext.model.User;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.aggregation.*;
+import myconext.model.IdpScoping;
 import org.bson.Document;
+import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Repository;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 @Repository
 public class MetricsRepository {
@@ -21,44 +18,43 @@ public MetricsRepository(MongoTemplate mongoTemplate) {
         this.mongoTemplate = mongoTemplate;
     }
 
-    public Number getTotalLinkedAccountCount() {
-        UnwindOperation unwindLinkedAccounts = Aggregation.unwind("linkedAccounts");
-        CountOperation countTotal = Aggregation.count().as("totalLinkedAccounts");
-        TypedAggregation<User> aggregation = Aggregation.newAggregation(
-                User.class,
-                unwindLinkedAccounts,
-                countTotal
-        );
-        AggregationResults<Map> results = mongoTemplate.aggregate(
-                aggregation,
-                Map.class
-        );
-        return (Number) results.getUniqueMappedResult().get("totalLinkedAccounts");
+    public Integer countTotalLinkedAccounts() {
+        return doInCollection("users",
+                List.of(
+                        "{ \"$unwind\": \"$linkedAccounts\" }",
+                        "{ \"$count\": \"totalLinkedAccounts\" }"
+                ), "totalLinkedAccounts");
     }
 
-    // Alternative approach: Using MongoTemplate's native execute method
-    public Number countTotalLinkedAccountsNativeExecute() {
-        /*
-            users.aggregate([
-                  {
-                    "$unwind": "$linkedAccounts"
-                  },
-                  {
-                    "$count": "totalLinkedAccounts"
-                  }
-                ])
+    public Integer countTotalExternalLinkedAccountsByType(IdpScoping idpScoping) {
+        return doInCollection("users",
+                List.of(
+                        "{ \"$unwind\": \"$externalLinkedAccounts\" }",
+                        "{ \"$match\": { \"externalLinkedAccounts.idpScoping\": \"" + idpScoping.name() + "\" } },",
+                        "{ \"$count\": \"countExternalLinkedAccounts\" }"
+                ), "countExternalLinkedAccounts");
+    }
 
-         */
-        return mongoTemplate.execute("users", collection -> {
-            List<Document> pipeline = Arrays.asList(
-                    Document.parse("{ \"$unwind\": \"$linkedAccounts\" }"),
-                    Document.parse("{ \"$count\": \"totalLinkedAccounts\" }")
-            );
+    public Integer countTotalRegisteredApps() {
+        return doInCollection("users",
+                List.of(
+                        "{ \"$unwind\": \"$eduIDS\" }",
+                        "{ \"$unwind\": \"$eduIDS.services\" }",
+                        "{ \"$group\": { \"_id\": \"$eduIDS.services.entityId\" } },",
+                        "{ \"$count\": \"countTotalRegisteredApps\" }"
+                ), "countTotalRegisteredApps");
+    }
 
-            AggregateIterable<Document> result = collection.aggregate(pipeline);
+    private Integer doInCollection(String collectionName, List<String> pipeLines, String resultKeyWord) {
+        return mongoTemplate.execute(collectionName, collection -> {
+            List<Document> documents = pipeLines
+                    .stream()
+                    .map(Document::parse)
+                    .toList();
+            AggregateIterable<Document> result = collection.aggregate(documents);
             Document doc = result.first();
-
-            return doc != null ? doc.getInteger("totalLinkedAccounts") : 0;
+            return doc != null ? doc.getInteger(resultKeyWord) : 0;
         });
+
     }
 }

myconext-server/src/main/resources/application.yml

@@ -267,8 +267,7 @@ management:
   endpoints:
     web:
       exposure:
-#        include: "health,info,prometheus"
-        include: "*"
+        include: "health,info,prometheus"
       base-path: "/internal"
   endpoint:
     info:

myconext-server/src/test/java/myconext/repository/MetricsRepositoryTest.java

@@ -1,12 +1,11 @@
 package myconext.repository;
 
 import myconext.AbstractIntegrationTest;
+import myconext.model.IdpScoping;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class MetricsRepositoryTest extends AbstractIntegrationTest {
 
@@ -15,11 +14,12 @@ class MetricsRepositoryTest extends AbstractIntegrationTest {
 
     @Test
     void getTotalLinkedAccountCount() {
-        Number totalLinkedAccountCount = metricsRepository.getTotalLinkedAccountCount();
-        System.out.println(totalLinkedAccountCount);
-
-        Number l = metricsRepository.countTotalLinkedAccountsNativeExecute();
-        System.out.println(l);
+        Integer totalLinkedAccountCount = metricsRepository.countTotalLinkedAccounts();
+        assertEquals(2, totalLinkedAccountCount);
+        Integer idinExternalAccounts = metricsRepository.countTotalExternalLinkedAccountsByType(IdpScoping.idin);
+        assertEquals(0, idinExternalAccounts);
+        Integer countTotalRegisteredApps = metricsRepository.countTotalRegisteredApps();
+        assertEquals(2, countTotalRegisteredApps);
     }
 
 }

servicedesk-gui/src/tabs/Verification.jsx

@@ -60,11 +60,6 @@ const Verification = ({proceed}) => {
                 />
             </div>
             {error && <ErrorIndicator message={I18n.t("verification.error", {code: code})}/>}
-            <div className="disclaimer">
-                <AlertIcon/>
-                <p>{I18n.t("verification.info")}</p>
-            </div>
-
         </div>
         </>
     );