Registry log

server/cmd/register_attempts.json

@@ -0,0 +1,110 @@
+{
+  "Model": {},
+  "Registry": {},
+  "Component": {
+    "Filter": {
+      "Attempt": 1,
+      "Error": {
+        "Code": "11098",
+        "Severity": 2,
+        "ShortDescription": [
+          "Empty schema for the component"
+        ],
+        "LongDescription": null,
+        "ProbableCause": [
+          "The schema is empty for the component."
+        ],
+        "SuggestedRemediation": [
+          "For the particular component the schema is empty. Use the docs or discussion forum for more details  "
+        ]
+      }
+    },
+    "Filter Policy": {
+      "Attempt": 1,
+      "Error": {
+        "Code": "11098",
+        "Severity": 2,
+        "ShortDescription": [
+          "Empty schema for the component"
+        ],
+        "LongDescription": null,
+        "ProbableCause": [
+          "The schema is empty for the component."
+        ],
+        "SuggestedRemediation": [
+          "For the particular component the schema is empty. Use the docs or discussion forum for more details  "
+        ]
+      }
+    },
+    "Project": {
+      "Attempt": 1,
+      "Error": {
+        "Code": "11098",
+        "Severity": 2,
+        "ShortDescription": [
+          "Empty schema for the component"
+        ],
+        "LongDescription": null,
+        "ProbableCause": [
+          "The schema is empty for the component."
+        ],
+        "SuggestedRemediation": [
+          "For the particular component the schema is empty. Use the docs or discussion forum for more details  "
+        ]
+      }
+    },
+    "Project Controller": {
+      "Attempt": 1,
+      "Error": {
+        "Code": "11098",
+        "Severity": 2,
+        "ShortDescription": [
+          "Empty schema for the component"
+        ],
+        "LongDescription": null,
+        "ProbableCause": [
+          "The schema is empty for the component."
+        ],
+        "SuggestedRemediation": [
+          "For the particular component the schema is empty. Use the docs or discussion forum for more details  "
+        ]
+      }
+    },
+    "Project Revision": {
+      "Attempt": 1,
+      "Error": {
+        "Code": "11098",
+        "Severity": 2,
+        "ShortDescription": [
+          "Empty schema for the component"
+        ],
+        "LongDescription": null,
+        "ProbableCause": [
+          "The schema is empty for the component."
+        ],
+        "SuggestedRemediation": [
+          "For the particular component the schema is empty. Use the docs or discussion forum for more details  "
+        ]
+      }
+    },
+    "Rate Limit": {
+      "Attempt": 1,
+      "Error": {
+        "Code": "11098",
+        "Severity": 2,
+        "ShortDescription": [
+          "Empty schema for the component"
+        ],
+        "LongDescription": null,
+        "ProbableCause": [
+          "The schema is empty for the component."
+        ],
+        "SuggestedRemediation": [
+          "For the particular component the schema is empty. Use the docs or discussion forum for more details  "
+        ]
+      }
+    }
+  },
+  "Relationship": {},
+  "Policy": {}
+}

server/handlers/component_handler.go

@@ -2,13 +2,16 @@
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"strconv"
 
+	"github.com/gofrs/uuid"
 	"github.com/gorilla/mux"
 	"github.com/layer5io/meshery/server/helpers/utils"
 	"github.com/layer5io/meshery/server/models"
 	"github.com/layer5io/meshery/server/models/pattern/core"
+	"github.com/layer5io/meshkit/models/events"
 	"github.com/layer5io/meshkit/models/meshmodel/core/types"
 	"github.com/layer5io/meshkit/models/meshmodel/core/v1alpha1"
 	"github.com/layer5io/meshkit/models/meshmodel/registry"
@@ -1275,6 +1278,85 @@
 	go h.config.MeshModelSummaryChannel.Publish()
 }
 
+// swagger:route POST /api/meshmodel/nonRegisterEntity
+// Handle POST request for registering meshmodel components.
+//
+// Validate the given value with the given schema
+// responses:
+// 	200:MeshModelHostsWithEntitySummary
+
+// request body should be json
+// request body should be of Host format
+
+func (handler *Handler) NonRegisterEntity(responseWriter http.ResponseWriter, request *http.Request, _ *models.Preference, user *models.User, provider models.Provider) {
+	responseWriter.Header().Set("Content-Type", "application/json")
+	defer request.Body.Close()
+
+	var receivedHost registry.Host
+	if err := json.NewDecoder(request.Body).Decode(&receivedHost); err != nil {
+		http.Error(responseWriter, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	filter := &v1alpha1.HostFilter{
+		DisplayName: receivedHost.Hostname,
+	}
+
+	hosts, _, _ := handler.registryManager.GetRegistrants(filter)
+
+	successMessage := ""
+	for _, host := range hosts {
+		successMessage = fmt.Sprintf("For registrant %s successfully imported", receivedHost.Hostname)
+
+		appendIfNonZero := func(value int64, label string) {
+			if value != 0 {
+				successMessage += fmt.Sprintf(" %d %s", value, label)
+			}
+		}
+
+		appendIfNonZero(host.Summary.Models, "models")
+		appendIfNonZero(host.Summary.Components, "components")
+		appendIfNonZero(host.Summary.Relationships, "relationships")
+		appendIfNonZero(host.Summary.Policies, "policies")
+
+	}
+
+	// Event creation
+	userID := uuid.FromStringOrNil(user.ID)
+	eventBuilder := events.NewEvent().FromUser(userID).FromSystem(*handler.SystemID).WithCategory("entity").WithAction("get_summary")
+
+	// Adding metadata for the event
+	eventBuilder.WithMetadata(map[string]interface{}{
+		"Hostname": receivedHost.Hostname,
+	})
+
+	// Success event
+	eventBuilder.WithSeverity(events.Success).WithDescription(successMessage)
+	successEvent := eventBuilder.Build()
+
+	// Build and publish the events
+	_ = provider.PersistEvent(successEvent)
+
+	go handler.config.EventBroadcaster.Publish(userID, successEvent)
+
+	failedMessage, _ := registry.FailedMsgCompute("", receivedHost.Hostname)
+	if failedMessage != "" {
+		failedMessage = fmt.Sprintf("For registrant %s %s", receivedHost.Hostname, failedMessage)
+		// Error event
+		errorEventBuilder := events.NewEvent().FromUser(userID).FromSystem(*handler.SystemID).WithCategory("entity").WithAction("get_summary")
+		errorEventBuilder.WithSeverity(events.Error).WithDescription(failedMessage)
+		errorEvent := errorEventBuilder.Build()
+		errorEventBuilder.WithMetadata(map[string]interface{}{
+			"Hostname":              receivedHost.Hostname,
+			"Details":               fmt.Sprintf("The import process for a registrant %s encountered difficulties,due to which %s. Specific issues during the import process resulted in certain entities not being successfully registered in the table.", receivedHost.Hostname, failedMessage),
+			"Suggested-remediation": "Check /server/cmd/registery_attempts.json for futher details",
+		})
+		_ = provider.PersistEvent(errorEvent)
+		go handler.config.EventBroadcaster.Publish(userID, errorEvent)
+	}
+
+}
+
 // swagger:route GET /api/meshmodels/registrants GetMeshmodelRegistrants
 // Handle GET request for getting all meshmodel registrants
 //
@@ -1296,7 +1378,7 @@
 func (h *Handler) GetMeshmodelRegistrants(rw http.ResponseWriter, r *http.Request) {
 	rw.Header().Add("Content-Type", "application/json")
 	enc := json.NewEncoder(rw)
-
+	registry.Mutex.Lock()
 	limitstr := r.URL.Query().Get("pagesize")
 	pagestr := r.URL.Query().Get("page")
 
@@ -1330,7 +1412,7 @@
 		http.Error(rw, ErrGetMeshModels(err).Error(), http.StatusInternalServerError)
 		return
 	}
-
+	registry.Mutex.Unlock()
 	var pgSize int64
 
 	if limitstr == "all" {

server/meshmodel/helper.go

@@ -14,6 +14,8 @@
 	"github.com/layer5io/meshkit/models/meshmodel/core/v1alpha1"
 	meshmodel "github.com/layer5io/meshkit/models/meshmodel/registry"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
 )
 
 var ArtifactHubComponentsHandler = meshmodel.ArtifactHub{} //The components generated in output directory will be handled by kubernetes
@@ -162,6 +164,7 @@
 // If an error occurs, it logs the error
 func (erh *EntityRegistrationHelper) watchComponents(ctx context.Context) {
 	var err error
+	meshmodel.Mutex.Lock()
 	for {
 		select {
 		case comp := <-erh.componentChan:
@@ -180,6 +183,8 @@
 			}
 
 		case <-ctx.Done():
+			registryLog(erh.regManager)
+			meshmodel.Mutex.Unlock()
 			return
 		}
 
@@ -188,3 +193,72 @@
 		}
 	}
 }
+func writeToFile(filePath string, data []byte) error {
+	file, err := os.Create(filePath)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	_, err = file.Write(data)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+func registryLog(regManager *meshmodel.RegistryManager) {
+	logLevel := viper.GetInt("LOG_LEVEL")
+	if viper.GetBool("DEBUG") {
+		logLevel = int(logrus.DebugLevel)
+	}
+	// Initialize Logger instance
+	log, err := logger.New("meshery", logger.Options{
+		Format:   logger.SyslogLogFormat,
+		LogLevel: logLevel,
+	})
+
+	if err != nil {
+		logrus.Error(err)
+		os.Exit(1)
+	}
+
+	hosts, _, err := regManager.GetRegistrants(&v1alpha1.HostFilter{})
+	if err != nil {
+		log.Error(err)
+	}
+	for _, host := range hosts {
+		summary := host.Summary
+		addNonZero := func(a, b int64) int64 {
+			if b != 0 {
+				return a + b
+			}
+			return a
+		}
+		totalModels := addNonZero(0, summary.Models)
+		totalComponents := addNonZero(0, summary.Components)
+		totalRelationships := addNonZero(0, summary.Relationships)
+		totalPolicies := addNonZero(0, summary.Policies)
+
+		log.Info(fmt.Sprintf("For registrant %s successfully imported %d models %d components %d relationships %d policy",
+			host.Hostname, totalModels, totalComponents, totalRelationships, totalPolicies))
+
+		failedMsg, _ := meshmodel.FailedMsgCompute("", host.Hostname)
+		if failedMsg != "" {
+			log.Error(meshmodel.ErrRegisteringEntity(failedMsg, host.Hostname))
+		}
+	}
+
+	filePath := "register_attempts.json"
+	jsonData, err := json.MarshalIndent(meshmodel.RegisterAttempts, "", "  ")
+	if err != nil {
+		log.Error(meshmodel.ErrMarshalingRegisteryAttempts(err))
+		return
+	}
+
+	err = writeToFile(filePath, jsonData)
+	if err != nil {
+		log.Error(meshmodel.ErrWritingRegisteryAttempts(err))
+		return
+	}
+}

server/models/handlers.go

@@ -122,7 +122,7 @@ type HandlerInterface interface {
 	RegisterMeshmodelComponents(rw http.ResponseWriter, r *http.Request)
 
 	GetMeshmodelRegistrants(rw http.ResponseWriter, r *http.Request)
-
+	NonRegisterEntity(w http.ResponseWriter, r *http.Request, prefObj *Preference, user *User, provider Provider)
 	HandleResourceSchemas(rw http.ResponseWriter, r *http.Request)
 
 	GetMeshmodelComponentByModel(rw http.ResponseWriter, r *http.Request)

server/router/server.go

@@ -188,7 +188,7 @@ func NewRouter(_ context.Context, h models.HandlerInterface, port int, g http.Ha
 	gMux.Handle("/api/meshmodels/models/{model}", h.ProviderMiddleware(h.AuthMiddleware(http.HandlerFunc(h.GetMeshmodelModelsByName), models.NoAuth))).Methods("GET")
 
 	gMux.Handle("/api/meshmodels/registrants", h.ProviderMiddleware(h.AuthMiddleware(http.HandlerFunc(h.GetMeshmodelRegistrants), models.NoAuth))).Methods("GET")
-
+	gMux.Handle("/api/meshmodels/nonRegisterEntity", h.ProviderMiddleware(h.AuthMiddleware(h.SessionInjectorMiddleware(h.NonRegisterEntity), models.ProviderAuth))).Methods("POST")
 	gMux.Handle("/api/meshmodels/categories/{category}", h.ProviderMiddleware(h.AuthMiddleware(http.HandlerFunc(h.GetMeshmodelCategoriesByName), models.NoAuth))).Methods("GET")
 	gMux.Handle("/api/meshmodels/categories/{category}/models", h.ProviderMiddleware(h.AuthMiddleware(http.HandlerFunc(h.GetMeshmodelModelsByCategories), models.NoAuth))).Methods("GET")
 	gMux.Handle("/api/meshmodels/categories/{category}/models/{model}", h.ProviderMiddleware(h.AuthMiddleware(http.HandlerFunc(h.GetMeshmodelModelsByCategoriesByModel), models.NoAuth))).Methods("GET")

ui/components/DashboardComponent/notifyRegistrant.js

@@ -0,0 +1,44 @@
+import React, { useEffect } from 'react';
+import { useDispatch } from 'react-redux';
+import { loadEvents } from '../../store/slices/events';
+
+const NotifyRegistrant = () => {
+  const dispatch = useDispatch();
+
+  const fetchData = async () => {
+    try {
+      const response = await fetch('api/meshmodels/registrants');
+      const data = await response.json();
+      console.log(response);
+      if (data.total_count > 0) {
+        for (const registrant of data.registrants) {
+          const { hostname } = registrant;
+          await fetch('api/meshmodels/nonRegisterEntity', {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({ Hostname: hostname }),
+          });
+        }
+      }
+    } catch (error) {
+      console.error('Error fetching data:', error);
+    }
+  };
+
+  useEffect(() => {
+    const isInitialVisit = localStorage.getItem('isInitialVisit') === null;
+
+    if (isInitialVisit) {
+      dispatch(loadEvents(fetchData, 1, {}));
+      localStorage.setItem('isInitialVisit', 'true');
+    } else {
+      fetchData();
+    }
+  }, [dispatch]);
+
+  return <div></div>;
+};
+
+export default NotifyRegistrant;