Dev 45139 grafana x validations UI updates

custom.ini

@@ -82,3 +82,6 @@ min_refresh_interval = 30s
 [log.frontend]
 enabled = true
 custom_endpoint = log
+
+[feature_toggles]
+dashgpt = false

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",

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() {
 
       <TopSearchBarSection align="right">
         <QuickAdd />
-        {enrichedHelpNode && (
+        {enrichedHelpNode && ( 
           <Dropdown overlay={() => <TopNavBarMenu node={enrichedHelpNode} />} placement="bottom-end">
             <ToolbarButton iconOnly icon="question-circle" aria-label="Help" />
           </Dropdown>

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 (

public/app/core/components/Branding/Branding.tsx

@@ -10,6 +10,7 @@ export interface BrandComponentProps {
 }
 
 export const LoginLogo: FC<BrandComponentProps & { logo?: string }> = ({ className, logo }) => {
+  return null; // LOGZ.IO GRAFANA CHANGE :: remove original logo
   return <img className={className} src={`${logo ? logo : 'public/img/grafana_icon.svg'}`} alt="Grafana" />;
 };
 
@@ -43,6 +44,7 @@ const LoginBackground: FC<BrandComponentProps> = ({ className, children }) => {
 };
 
 const MenuLogo: FC<BrandComponentProps> = ({ className }) => {
+  return null; // LOGZ.IO GRAFANA CHANGE :: remove original logo
   return <img className={className} src="public/img/grafana_icon.svg" alt="Grafana" />;
 };
 

public/app/core/components/SharedPreferences/SharedPreferences.tsx

@@ -199,6 +199,7 @@ export class SharedPreferences extends PureComponent<Props, State> {
           </Field>
 
           <Field
+            hidden // LOGZ.IO GRAFANA CHANGE :: hide language in profile
             label={
               <Label htmlFor="locale-select">
                 <span className={styles.labelText}>

public/app/features/admin/LicenseChrome.tsx

@@ -41,28 +41,31 @@ export function LicenseChrome({ header, editionNotice, subheader, children }: Pr
 
   return (
     <>
-      <div className={styles.header}>
-        <h2 style={title}>{header}</h2>
-        {subheader && <h3>{subheader}</h3>}
+    { false && ( // LOGZ.IO GRAFANA CHANGE :: remove original logo
+        <div className={styles.header}>
+          <h2 style={title}>{header}</h2>
+          {subheader && <h3>{subheader}</h3>}
+
+          <Circle
+            size="128px"
+            style={{
+              boxShadow: '0px 0px 24px rgba(24, 58, 110, 0.45)',
+              background: '#0A1C36',
+              position: 'absolute',
+              top: '19px',
+              left: '71%',
+            }}
+          >
+            <img
+              src="public/img/grafana_icon.svg"
+              alt="Grafana"
+              width="80px"
+              style={{ position: 'absolute', left: '23px', top: '20px' }}
+            />
+          </Circle>
+        </div>
+      )}
 
-        <Circle
-          size="128px"
-          style={{
-            boxShadow: '0px 0px 24px rgba(24, 58, 110, 0.45)',
-            background: '#0A1C36',
-            position: 'absolute',
-            top: '19px',
-            left: '71%',
-          }}
-        >
-          <img
-            src="public/img/grafana_icon.svg"
-            alt="Grafana"
-            width="80px"
-            style={{ position: 'absolute', left: '23px', top: '20px' }}
-          />
-        </Circle>
-      </div>
 
       <div className={styles.container}>{children}</div>
 

public/app/features/alerting/unified/components/rule-editor/rule-types/GrafanaManagedAlert.tsx

@@ -15,7 +15,7 @@ const GrafanaManagedRuleType = ({ selected = false, disabled, onClick }: SharedP
           Transform data with expressions.
         </span>
       }
-      image="public/img/grafana_icon.svg"
+      image="" // "public/img/grafana_icon.svg" LOGZ.IO GRAFANA CHANGE :: remove original logo
       selected={selected}
       disabled={disabled}
       value={RuleFormType.grafana}

public/views/index.html

@@ -70,7 +70,7 @@
         height: 60px;
         background-repeat: no-repeat;
         background-size: contain;
-        background-image: url('[[.LoadingLogo]]');
+        background-image: none; /* url('[[.LoadingLogo]]'); LOGZ.IO GRAFANA CHANGE :: remove original logo */
       }
 
       .preloader__text {

public/views/swagger.html

@@ -33,7 +33,7 @@
       }
 
       .topbar-wrapper img {
-        content: url('public/img/grafana_icon.svg');
+        content: "";  /* url('public/img/grafana_icon.svg'); LOGZ.IO GRAFANA CHANGE :: remove original logo */
       }
     </style>
   </head>