Merge pull request #849 from Altinity/issue-836

Add absent user information

Author: Slach

pkg/eval/eval_query.go

@@ -51,7 +51,8 @@ type EvalQuery struct {
 	Database               string `json:"database"`
 	Table                  string `json:"table"`
 	MaxDataPoints          int64
-	FrontendDatasource     bool `json:"frontendDatasource"`
+	FrontendDatasource     bool   `json:"frontendDatasource"`
+	MetadataUserLogin      string `json:"metadataUserLogin"`
 	From                   time.Time
 	To                     time.Time
 }
@@ -1934,7 +1935,11 @@ func (s *EvalQueryScanner) RemoveComments(query string) (string, error) {
 
 func (s *EvalQueryScanner) AddMetadata(query string, q *EvalQuery) string {
 	if q.FrontendDatasource {
-		return "/* grafana dashboard=$__dashboard, user=$__user */\n" + query
+		userLogin := q.MetadataUserLogin
+		if userLogin == "" {
+			userLogin = "$__user"
+		}
+		return "/* grafana dashboard=$__dashboard, user=" + userLogin + " */\n" + query
 	}
 	return "/* grafana alerts rule=" + q.RuleUid + " query=" + q.RefId + " */ " + query
 }

src/datasource/datasource.ts

@@ -15,7 +15,7 @@ import {
   QueryFilterOptions,
   TypedVariableModel, VariableSupportType,
 } from '@grafana/data';
-import { BackendSrv, DataSourceWithBackend, getBackendSrv, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
+import { BackendSrv, config, DataSourceWithBackend, getBackendSrv, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
 
 import {CHDataSourceOptions, CHQuery, DatasourceMode, DEFAULT_QUERY} from '../types/types';
 import {QueryEditor, QueryEditorVariable} from '../views/QueryEditor/QueryEditor';
@@ -831,6 +831,8 @@ export class CHDataSource
           from: options.range.from.toISOString(), // Convert to Unix timestamp
           to: options.range.to.toISOString(), // Convert to Unix timestamp
         },
+        // Pass actual user login for metadata (fix for issue #836)
+        metadataUserLogin: config.bootData?.user?.login || '',
       };
 
       // Apply template variable replacements (these don't require backend processing)