add links to dashboard

bakito · Nov 13, 2023 · 37ee52a · 37ee52a
1 parent da28901
commit 37ee52a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/pkg/sync/http.go b/pkg/sync/http.go
@@ -129,6 +129,7 @@ type syncStatus struct {
 
 type replicaStatus struct {
 	Host   string `json:"origin"`
+	URL    string `json:"url"`
 	Status string `json:"status"`
-	Error  string `json:"error,omitempty"`
+	Error  string `json:"error"`
 }
diff --git a/pkg/sync/index.html b/pkg/sync/index.html
@@ -21,11 +21,11 @@
                 $.get("api/v1/status", {}, function (status) {
                         $('#origin').removeClass(function (index, className) {
                             return (className.match(/(^|\s)btn-\S+/g) || []).join(' ');
-                        }).addClass("btn-" + status.origin.status);
+                        }).addClass("btn-" + status.origin.status).attr('title', status.origin.error);
                         status.replicas.forEach(function (replica, i) {
                             $('#replica_' + i).removeClass(function (index, className) {
                                 return (className.match(/(^|\s)btn-\S+/g) || []).join(' ');
-                            }).addClass("btn-" + replica.status);
+                            }).addClass("btn-" + replica.status).attr('title', replica.error);
                         });
                     }
                 );
@@ -57,11 +57,13 @@
         </div>
         <div class="col col-md-auto">
             <div class="float-right">
-                <input class="btn btn-{{ .SyncStatus.Origin.Status }}" type="button" id="origin"
-                       value="Origin {{ .SyncStatus.Origin.Host }}"/>
+                <a href="{{ .SyncStatus.Origin.URL }}" target="_blank" class="btn btn-{{ .SyncStatus.Origin.Status }}"
+                   type="button" id="origin"
+                   {{ if .SyncStatus.Origin.Error }} title="{{ .SyncStatus.Origin.Error }}" {{ end }}>Origin {{ .SyncStatus.Origin.Host }}</a>
                 {{ range $i, $r := .SyncStatus.Replicas }}
-                <input class="btn btn-{{ $r.Status }}" type="button" id="replica_{{ $i }}" value="Replica {{ $r.Host }}"
-                       {{ if $r.Error }} title="{{ $r.Error }}" {{ end }}/>
+                <a href="{{ $r.URL }}" target="_blank" class="btn btn-{{ $r.Status }}"
+                   type="button" id="replica_{{ $i }}"
+                   {{ if $r.Error }} title="{{ $r.Error }}" {{ end }} >Replica {{ $r.Host }}</a>
                 {{ end }}
             </div>
         </div>
@@ -73,4 +75,4 @@
     </div>
 </div>
 </body>
-</html>
+</html>
diff --git a/pkg/sync/sync.go b/pkg/sync/sync.go
@@ -116,18 +116,18 @@ func (w *worker) getStatus(inst types.AdGuardInstance) replicaStatus {
 	oc, err := w.createClient(inst)
 	if err != nil {
 		l.With("error", err, "url", w.cfg.Origin.URL).Error("Error creating origin client")
-		return replicaStatus{Host: oc.Host(), Error: err.Error(), Status: "danger"}
+		return replicaStatus{Host: oc.Host(), URL: inst.URL, Error: err.Error(), Status: "danger"}
 	}
 	sl := l.With("from", oc.Host())
 	_, err = oc.Status()
 	if err != nil {
 		if errors.Is(err, client.ErrSetupNeeded) {
-			return replicaStatus{Host: oc.Host(), Error: err.Error(), Status: "warning"}
+			return replicaStatus{Host: oc.Host(), URL: inst.URL, Error: err.Error(), Status: "warning"}
 		}
 		sl.With("error", err).Error("Error getting origin status")
-		return replicaStatus{Host: oc.Host(), Error: err.Error(), Status: "danger"}
+		return replicaStatus{Host: oc.Host(), URL: inst.URL, Error: err.Error(), Status: "danger"}
 	}
-	st := replicaStatus{Host: oc.Host(), Status: "success"}
+	st := replicaStatus{Host: oc.Host(), URL: inst.URL, Status: "success"}
 	return st
 }