Merge pull request #8 from intergral/update_grafusion

Update grafusion

.github/workflows/on_push_go.yml

@@ -13,6 +13,7 @@ concurrency:
 
 jobs:
   test:
+    name: Test
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/on_push_ui.yml

@@ -13,6 +13,7 @@ concurrency:
 
 jobs:
   test:
+    name: Test
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/on_release.yml

@@ -9,7 +9,8 @@ permissions:
   contents: write
 
 jobs:
-  goreleaser:
+  release:
+    name: Release
     runs-on: ubuntu-latest-m
     steps:
       - name: Checkout

Makefile

@@ -225,6 +225,13 @@ golangci-lint: $(GOLANGCI_LINT)
 		--config .golangci.toml \
 		$(GO_FILES)
 
+lint-fix: $(GOLANGCI_LINT)
+	@echo "lint via golangci-lint"
+	$(GOLANGCI_LINT) run \
+		--config .golangci.toml \
+		--fix \
+		$(GO_FILES)
+
 lint-go: golangci-lint ## Run all code checks for backend. You can use GO_FILES to specify exact files to check
 
 # with disabled SC1071 we are ignored some TCL,Expect `/usr/bin/env expect` scripts

conf/defaults.ini

@@ -1357,6 +1357,10 @@ news_feed_enabled = true
 # Set the number of data source queries that can be executed concurrently in mixed queries. Default is the number of CPUs.
 concurrent_query_limit =
 
+[kiosk]
+# Enable the kiosk section
+mode = off
+
 #################################### Query History #############################
 [query_history]
 # Enable the Query history

packages/grafana-data/src/types/config.ts

@@ -170,6 +170,7 @@ export interface GrafanaConfig {
   alertingMinInterval: number;
   authProxyEnabled: boolean;
   exploreEnabled: boolean;
+  kioskMode: string;
   queryHistoryEnabled: boolean;
   helpEnabled: boolean;
   profileEnabled: boolean;

packages/grafana-runtime/src/config.ts

@@ -63,6 +63,7 @@ export class GrafanaBootConfig implements GrafanaConfig {
   angularSupportEnabled = false;
   authProxyEnabled = false;
   exploreEnabled = false;
+  kioskMode = 'off';
   queryHistoryEnabled = false;
   helpEnabled = false;
   profileEnabled = false;

pkg/api/dtos/frontend_settings.go

@@ -146,15 +146,16 @@ type FrontendSettingsDTO struct {
 	LiveEnabled                bool                             `json:"liveEnabled"`
 	AutoAssignOrg              bool                             `json:"autoAssignOrg"`
 
-	VerifyEmailEnabled  bool `json:"verifyEmailEnabled"`
-	SigV4AuthEnabled    bool `json:"sigV4AuthEnabled"`
-	AzureAuthEnabled    bool `json:"azureAuthEnabled"`
-	RbacEnabled         bool `json:"rbacEnabled"`
-	ExploreEnabled      bool `json:"exploreEnabled"`
-	HelpEnabled         bool `json:"helpEnabled"`
-	ProfileEnabled      bool `json:"profileEnabled"`
-	NewsFeedEnabled     bool `json:"newsFeedEnabled"`
-	QueryHistoryEnabled bool `json:"queryHistoryEnabled"`
+	VerifyEmailEnabled  bool   `json:"verifyEmailEnabled"`
+	SigV4AuthEnabled    bool   `json:"sigV4AuthEnabled"`
+	AzureAuthEnabled    bool   `json:"azureAuthEnabled"`
+	RbacEnabled         bool   `json:"rbacEnabled"`
+	ExploreEnabled      bool   `json:"exploreEnabled"`
+	KioskMode           string `json:"kioskMode"`
+	HelpEnabled         bool   `json:"helpEnabled"`
+	ProfileEnabled      bool   `json:"profileEnabled"`
+	NewsFeedEnabled     bool   `json:"newsFeedEnabled"`
+	QueryHistoryEnabled bool   `json:"queryHistoryEnabled"`
 
 	GoogleAnalyticsId                   string `json:"googleAnalyticsId"`
 	GoogleAnalytics4Id                  string `json:"googleAnalytics4Id"`

pkg/api/frontendsettings.go

@@ -129,6 +129,7 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		ProfileEnabled:                      setting.ProfileEnabled,
 		NewsFeedEnabled:                     setting.NewsFeedEnabled,
 		QueryHistoryEnabled:                 hs.Cfg.QueryHistoryEnabled,
+		KioskMode:                           setting.KioskMode,
 		GoogleAnalyticsId:                   hs.Cfg.GoogleAnalyticsID,
 		GoogleAnalytics4Id:                  hs.Cfg.GoogleAnalytics4ID,
 		GoogleAnalytics4SendManualPageViews: hs.Cfg.GoogleAnalytics4SendManualPageViews,

pkg/services/navtree/navtreeimpl/navtree.go

@@ -4,20 +4,21 @@ import (
 	"fmt"
 	"sort"
 
+	"github.com/grafana/grafana/pkg/models/roletype"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/org"
+
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/infra/kvstore"
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/models/roletype"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/apikey"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/services/navtree"
-	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	pref "github.com/grafana/grafana/pkg/services/preference"
@@ -476,7 +477,6 @@ func (s *ServiceImpl) buildAlertNavLinks(c *contextmodel.ReqContext) *navtree.Na
 
 		return &alertNav
 	}
-
 	return nil
 }
 

pkg/setting/setting.go

@@ -130,6 +130,9 @@ var (
 	// Explore UI
 	ExploreEnabled bool
 
+	//kiosk mode
+	KioskMode string
+
 	// Help UI
 	HelpEnabled bool
 
@@ -1156,6 +1159,9 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
 	explore := iniFile.Section("explore")
 	ExploreEnabled = explore.Key("enabled").MustBool(true)
 
+	kiosk := iniFile.Section("kiosk")
+	KioskMode = valueAsString(kiosk, "mode", "off")
+
 	help := iniFile.Section("help")
 	HelpEnabled = help.Key("enabled").MustBool(true)
 

public/app/core/components/AppChrome/AppChrome.test.tsx

@@ -41,7 +41,7 @@ const mockSearchResult: QueryResponse = {
   view: new DataFrameView<DashboardQueryResult>(searchData),
 };
 
-const setup = (children: ReactNode) => {
+const setup = (children: ReactNode, hideSearch?: boolean) => {
   config.bootData.navTree = [
     {
       id: HOME_NAV_ID,
@@ -67,7 +67,7 @@ const setup = (children: ReactNode) => {
   const renderResult = render(
     <KBarProvider>
       <TestProvider grafanaContext={context}>
-        <AppChrome>
+        <AppChrome hideSearchBar={hideSearch}>
           <div data-testid="page-children">{children}</div>
         </AppChrome>
       </TestProvider>
@@ -117,7 +117,7 @@ describe('AppChrome', () => {
   });
 
   it('should focus the skip link on initial tab before carrying on with normal tab order', async () => {
-    setup(<Page navId="child1">Children</Page>);
+    setup(<Page navId="child1">Children</Page>, false);
     await userEvent.keyboard('{tab}');
     const skipLink = await screen.findByRole('link', { name: 'Skip to main content' });
     expect(skipLink).toHaveFocus();

public/app/core/components/AppChrome/AppChrome.tsx

@@ -7,6 +7,7 @@ import { useStyles2, LinkButton, useTheme2 } from '@grafana/ui';
 import config from 'app/core/config';
 import { useGrafana } from 'app/core/context/GrafanaContext';
 import { CommandPalette } from 'app/features/commandPalette/CommandPalette';
+import { useOpspilotMetadata } from 'app/intergral/useOpspilotMetadata';
 import { KioskMode } from 'app/types';
 
 import { AppChromeMenu } from './AppChromeMenu';
@@ -17,14 +18,15 @@ import { SectionNav } from './SectionNav/SectionNav';
 import { TopSearchBar } from './TopBar/TopSearchBar';
 import { TOP_BAR_LEVEL_HEIGHT } from './types';
 
-export interface Props extends PropsWithChildren<{}> {}
+export interface Props extends PropsWithChildren<{hideSearchBar?: boolean}> {}
 
-export function AppChrome({ children }: Props) {
+export function AppChrome({ children, hideSearchBar }: Props) {
   const { chrome } = useGrafana();
   const state = chrome.useState();
-  const searchBarHidden = state.searchBarHidden || state.kioskMode === KioskMode.TV;
+  const searchBarHidden = state.searchBarHidden || state.kioskMode === KioskMode.TV || (hideSearchBar ?? true);
   const theme = useTheme2();
   const styles = useStyles2(getStyles);
+  useOpspilotMetadata();
 
   const contentClass = cx({
     [styles.content]: true,

public/app/core/components/AppChrome/AppChromeService.tsx

@@ -141,6 +141,8 @@ export class AppChromeService {
         this.update({ kioskMode: KioskMode.TV });
         break;
       case '1':
+      case 'embed':
+        this.update({kioskMode: KioskMode.Embed });
       case true:
         this.update({ kioskMode: KioskMode.Full });
     }
@@ -150,6 +152,8 @@ export class AppChromeService {
     switch (mode) {
       case KioskMode.TV:
         return 'tv';
+      case KioskMode.Embed:
+        return 'embed';
       case KioskMode.Full:
         return true;
       default:

public/app/core/components/AppChrome/NavToolbar/NavToolbar.tsx

@@ -58,21 +58,6 @@ export function NavToolbar({
 
   return (
     <div data-testid={Components.NavToolbar.container} className={styles.pageToolbar}>
-      <div className={styles.menuButton}>
-        <IconButton
-          id={TOGGLE_BUTTON_ID}
-          name="bars"
-          tooltip={
-            state.megaMenu === 'closed' || (state.megaMenu === 'docked' && isTooSmallForDockedMenu)
-              ? t('navigation.toolbar.open-menu', 'Open menu')
-              : t('navigation.toolbar.close-menu', 'Close menu')
-          }
-          tooltipPlacement="bottom"
-          size="xl"
-          onClick={onToggleMegaMenu}
-          data-testid={Components.NavBar.Toggle.button}
-        />
-      </div>
       <Breadcrumbs breadcrumbs={breadcrumbs} className={styles.breadcrumbsWrapper} />
       <div className={styles.actions}>
         {actions}

public/app/core/components/Footer/Footer.tsx

@@ -99,21 +99,7 @@ export interface Props {
 }
 
 export const Footer = React.memo(({ customLinks, hideEdition }: Props) => {
-  const links = (customLinks || getFooterLinks()).concat(getVersionLinks(hideEdition));
-
-  return (
-    <footer className="footer">
-      <div className="text-center">
-        <ul>
-          {links.map((link) => (
-            <li key={link.text}>
-              <FooterItem item={link} />
-            </li>
-          ))}
-        </ul>
-      </div>
-    </footer>
-  );
+  return <footer className="footer"></footer>;
 });
 
 Footer.displayName = 'Footer';

public/app/core/navigation/kiosk.ts

@@ -1,17 +1,33 @@
 import { UrlQueryMap } from '@grafana/data';
 
 import { KioskMode } from '../../types';
+import config from '../config';
 
 // TODO Remove after topnav feature toggle is permanent and old NavBar is removed
 export function getKioskMode(queryParams: UrlQueryMap): KioskMode | null {
-  switch (queryParams.kiosk) {
-    case 'tv':
-      return KioskMode.TV;
-    //  legacy support
-    case '1':
-    case true:
-      return KioskMode.Full;
-    default:
-      return null;
+  if (config.kioskMode === 'off') {
+    switch (queryParams.kiosk) {
+      case 'tv':
+        return KioskMode.TV;
+      //  legacy support
+      case '1':
+      case 'full':
+      case true:
+        return KioskMode.Full;
+      case 'embed':
+        return KioskMode.Embed;
+      default:
+        return null;
+    }
+  } else {
+    switch (config.kioskMode) {
+      //  legacy support
+      case 'full':
+        return KioskMode.Full;
+      case 'embed':
+        return KioskMode.Embed;
+      default:
+        return null;
+    }
   }
 }

public/app/features/commandPalette/actions/staticActions.ts

@@ -86,5 +86,5 @@ export default (navBarTree: NavModelItem[]): CommandPaletteAction[] => {
 
   const navBarActions = navTreeToActions(navBarTree);
 
-  return [...globalActions, ...navBarActions];
+  return [...navBarActions];
 };

public/app/features/dashboard/components/DashNav/DashNav.tsx

@@ -169,7 +169,7 @@ export const DashNav = React.memo<Props>((props) => {
     const { canStar, canShare, isStarred } = dashboard.meta;
     const buttons: ReactNode[] = [];
 
-    if (kioskMode || isPlaylistRunning()) {
+    if ((kioskMode && kioskMode !== KioskMode.Embed) || isPlaylistRunning()) {
       return [];
     }
 

public/app/features/dashboard/containers/DashboardPage.tsx

@@ -321,9 +321,9 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
     }
 
     const inspectPanel = this.getInspectPanel();
-    const showSubMenu = !editPanel && !kioskMode && !this.props.queryParams.editview;
+    const showSubMenu = !editPanel && (!kioskMode || kioskMode === KioskMode.Embed) && !this.props.queryParams.editview;
 
-    const showToolbar = kioskMode !== KioskMode.Full && !queryParams.editview;
+    const showToolbar = kioskMode !== KioskMode.Full  && !queryParams.editview;
 
     const pageClassName = cx({
       'panel-in-fullscreen': Boolean(viewPanel),

public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx

@@ -62,15 +62,6 @@ export default function TracePageActions(props: TracePageActionsProps) {
 
   return (
     <div className={styles.TracePageActions}>
-      <a
-        href="https://forms.gle/RZDEx8ScyZNguDoC8"
-        className={styles.feedback}
-        title="Share your thoughts about tracing in Grafana."
-        target="_blank"
-        rel="noreferrer noopener"
-      >
-        <Icon name="comment-alt-message" /> Give feedback
-      </a>
 
       <ActionButton
         onClick={copyTraceId}

public/app/features/logs/components/LogDetailsRow.tsx

@@ -15,6 +15,7 @@ import {
 } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
 import { ClipboardButton, DataLinkButton, IconButton, Themeable2, withTheme2 } from '@grafana/ui';
+import { OpspilotDataLinkButton } from 'app/intergral/OpspilotDataLinkButton';
 
 import { logRowToSingleRowDataFrame } from '../logsModel';
 
@@ -323,7 +324,7 @@ class UnThemedLogDetailsRow extends PureComponent<Props, State> {
               <div className={cx((singleVal || isMultiParsedValueWithNoContent) && styles.adjoiningLinkButton)}>
                 {links?.map((link, i) => (
                   <span key={`${link.title}-${i}`}>
-                    <DataLinkButton link={link} />
+                    {link.title === "OpsPilot AI" ? <OpspilotDataLinkButton link={link} /> : <DataLinkButton link={link} />}  
                   </span>
                 ))}
               </div>

public/app/features/templating/template_srv.ts

@@ -145,7 +145,7 @@ export class TemplateSrv implements BaseTemplateSrv {
     for (const variable of this.getAdHocVariables()) {
       const variableUid = variable.datasource?.uid;
 
-      if (variableUid === ds.uid) {
+      if (variableUid === ds.uid || variableUid === ds.name) {
         filters = filters.concat(variable.filters);
       } else if (variableUid?.indexOf('$') === 0) {
         if (this.replace(variableUid) === ds.uid) {