Log distributed queries results locally

cmd/admin/handlers-get.go

@@ -547,13 +547,19 @@ func queryLogsHandler(w http.ResponseWriter, r *http.Request) {
 		log.Printf("error getting targets %v", err)
 		return
 	}
+	defLink, dbLink := queryResultLink(query.Name)
+	resLink := ""
+	if defLink != dbLink {
+		resLink = dbLink
+	}
 	// Prepare template data
 	templateData := QueryLogsTemplateData{
 		Title:        "Query logs " + query.Name,
 		Metadata:     templateMetadata(ctx, serviceName, serviceVersion),
 		Environments: envAll,
 		Platforms:    platforms,
 		Query:        query,
+		ResultsLink:  resLink,
 		QueryTargets: targets,
 	}
 	if err := t.Execute(w, templateData); err != nil {

cmd/admin/json-queries.go

@@ -97,7 +97,7 @@ func jsonQueryHandler(w http.ResponseWriter, r *http.Request) {
 		data := make(QueryData)
 		data["query"] = q.Query
 		data["name"] = q.Name
-		data["link"] = queryResultLink(q.Name)
+		data["deflink"], data["dblink"] = queryResultLink(q.Name)
 		// Preparing query targets
 		ts, _ := queriesmgr.GetTargets(q.Name)
 		_ts := []QueryTarget{}

cmd/admin/static/css/custom.css

@@ -157,3 +157,8 @@ button {
   align-items: center;
   justify-content: center;
 }
+
+.query-link {
+  font-family: monospace;
+  font-size: 1.3em;
+}

cmd/admin/static/js/query.js

@@ -105,3 +105,11 @@ function confirmDeleteQueries(_names) {
   });
   $("#confirmModal").modal();
 }
+
+function queryResultLink(defLink, dbLink, query) {
+  var query_link = '<span class="query-link"><a href="' + defLink + '">' + query + '</a></span>';
+  if (defLink !== dbLink) {
+    query_link = '<span class="query-link"><a href="' + defLink + '">' + query + '</a></span> <a href="' + dbLink + '" _target="_blank"><i class="fas fa-external-link-alt"></i></a>';
+  }
+  return query_link
+}

cmd/admin/templates/queries-logs.html

@@ -19,6 +19,7 @@
 
           <div class="animated fadeIn">
 
+          {{ $template := . }}
           {{ with .Query }}
             <div class="card mt-2">
               <div class="card-header">
@@ -27,6 +28,9 @@
                 {{ else }}
                   <i class="fas fa-hourglass-half"></i> [ <b>ACTIVE</b> ] - Results for {{ .Name }}
                 {{ end }}
+                {{ if $template.ResultsLink }}
+                  - <a href="{{ $template.ResultsLink }}" _target="_blank"><i class="fas fa-external-link-alt"></i></a>
+                {{ end }}
                 <div class="card-header-actions">
                   <button class="btn btn-sm btn-outline-primary" data-tooltip="true"
                     data-placement="bottom" title="Refresh table" onclick="refreshTableNow('tableQueryLogs');">

cmd/admin/templates/queries.html

@@ -123,7 +123,7 @@
               data: 'query',
               render: function (data, type, row, meta) {
                 if (type === 'display') {
-                  return '<span style="font-family: monospace; font-size: 1.3em;"><a href="'+data.link+'">'+data.query+'</a></span>';
+                  return queryResultLink(data.deflink, data.dblink, data.query);
                 } else {
                   return data;
                 }

cmd/admin/types-templates.go

@@ -116,6 +116,7 @@ type QueryLogsTemplateData struct {
 	Environments []environments.TLSEnvironment
 	Platforms    []string
 	Query        queries.DistributedQuery
+	ResultsLink  string
 	QueryTargets []queries.DistributedQueryTarget
 	Metadata     TemplateMetadata
 }

cmd/admin/utils.go

@@ -133,8 +133,10 @@ func removeBackslash(rawString string) string {
 }
 
 // Helper to generate a link to results for on-demand queries
-func queryResultLink(name string) string {
-	return strings.Replace(settingsmgr.QueryResultLink(), "{{NAME}}", removeBackslash(name), 1)
+func queryResultLink(name string) (string, string) {
+	defaultLink := strings.Replace(settings.QueryLink, "{{NAME}}", removeBackslash(name), 1)
+	dbLink := strings.Replace(settingsmgr.QueryResultLink(), "{{NAME}}", removeBackslash(name), 1)
+	return defaultLink, dbLink
 }
 
 // Helper to generate a link to results for status logs