diff --git a/custom.ini b/custom.ini index a737587ce4e93..a67689a8bc38b 100644 --- a/custom.ini +++ b/custom.ini @@ -82,3 +82,6 @@ min_refresh_interval = 30s [log.frontend] enabled = true custom_endpoint = log + +[feature_toggles] +dashgpt = false diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go index 55636be1d0a38..dcb2c355d924b 100644 --- a/pkg/services/navtree/navtreeimpl/navtree.go +++ b/pkg/services/navtree/navtreeimpl/navtree.go @@ -158,7 +158,7 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, prefs *pref.Prefere orgAdminNode, err := s.getAdminNode(c) if orgAdminNode != nil { - treeRoot.AddSection(orgAdminNode) + // treeRoot.AddSection(orgAdminNode) LOGZ.IO GRAFANA CHANGE :: hide administration from menu } else if err != nil { return nil, err } @@ -485,7 +485,7 @@ func (s *ServiceImpl) buildDataConnectionsNavLink(c *contextmodel.ReqContext) *n baseUrl := s.cfg.AppSubURL + "/connections" - if hasAccess(datasources.ConfigurationPageAccess) { + if false && hasAccess(datasources.ConfigurationPageAccess) { // LOGZ.IO GRAFANA CHANGE :: hide datasources menu, should be done by altering permissions // Add new connection children = append(children, &navtree.NavLink{ Id: "connections-add-new-connection", diff --git a/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx b/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx index 727f0cec7efa3..d26b885fcd103 100644 --- a/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx +++ b/public/app/core/components/AppChrome/TopBar/TopSearchBar.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { cloneDeep } from 'lodash'; +// import { cloneDeep } from 'lodash'; // LOGZ.IO GRAFANA CHANGE :: hide help menu import React from 'react'; import { useLocation } from 'react-router-dom'; @@ -10,7 +10,7 @@ import { contextSrv } from 'app/core/core'; import { useSelector } from 'app/types'; import { Branding } from '../../Branding/Branding'; -import { enrichHelpItem } from '../MegaMenu/utils'; +// import { enrichHelpItem } from '../MegaMenu/utils'; // LOGZ.IO GRAFANA CHANGE :: hide help menu import { NewsContainer } from '../News/NewsContainer'; import { OrganizationSwitcher } from '../OrganizationSwitcher/OrganizationSwitcher'; import { QuickAdd } from '../QuickAdd/QuickAdd'; @@ -26,8 +26,8 @@ export const TopSearchBar = React.memo(function TopSearchBar() { const navIndex = useSelector((state) => state.navIndex); const location = useLocation(); - const helpNode = cloneDeep(navIndex['help']); - const enrichedHelpNode = helpNode ? enrichHelpItem(helpNode) : undefined; + // const helpNode = cloneDeep(navIndex['help']); // LOGZ.IO GRAFANA CHANGE :: hide help menu + const enrichedHelpNode = null; // helpNode ? enrichHelpItem(helpNode) : undefined; // LOGZ.IO GRAFANA CHANGE :: hide help menu const profileNode = navIndex['profile']; let homeUrl = config.appSubUrl || '/'; @@ -50,7 +50,7 @@ export const TopSearchBar = React.memo(function TopSearchBar() { - {enrichedHelpNode && ( + {enrichedHelpNode && ( } placement="bottom-end"> diff --git a/public/app/core/components/BouncingLoader/BouncingLoader.tsx b/public/app/core/components/BouncingLoader/BouncingLoader.tsx index 21e7601053220..362e6fa01472e 100644 --- a/public/app/core/components/BouncingLoader/BouncingLoader.tsx +++ b/public/app/core/components/BouncingLoader/BouncingLoader.tsx @@ -7,6 +7,7 @@ import { useStyles2 } from '@grafana/ui'; import { t } from '../../internationalization'; export function BouncingLoader() { + return null; // LOGZ.IO GRAFANA CHANGE :: remove original logo const styles = useStyles2(getStyles); return ( diff --git a/public/app/core/components/Branding/Branding.tsx b/public/app/core/components/Branding/Branding.tsx index 15f37c694df71..754e6bb05a3cd 100644 --- a/public/app/core/components/Branding/Branding.tsx +++ b/public/app/core/components/Branding/Branding.tsx @@ -10,6 +10,7 @@ export interface BrandComponentProps { } export const LoginLogo: FC = ({ className, logo }) => { + return null; // LOGZ.IO GRAFANA CHANGE :: remove original logo return Grafana; }; @@ -43,6 +44,7 @@ const LoginBackground: FC = ({ className, children }) => { }; const MenuLogo: FC = ({ className }) => { + return null; // LOGZ.IO GRAFANA CHANGE :: remove original logo return Grafana; }; diff --git a/public/app/core/components/SharedPreferences/SharedPreferences.tsx b/public/app/core/components/SharedPreferences/SharedPreferences.tsx index ede28f1456d24..08be7cf9f2f00 100644 --- a/public/app/core/components/SharedPreferences/SharedPreferences.tsx +++ b/public/app/core/components/SharedPreferences/SharedPreferences.tsx @@ -199,6 +199,7 @@ export class SharedPreferences extends PureComponent {