Natel v6

.circleci/config.yml

@@ -12,7 +12,7 @@ aliases:
       ignore: master
   - &filter-only-master
     branches:
-      only: master
+      only: masterXXX # never match... for Natel
 
 version: 2
 
@@ -276,7 +276,7 @@ jobs:
           command: '/tmp/bootstrap.sh'
       - run:
           name: package grafana
-          command: './scripts/build/build.sh --fast --package-only'
+          command: './scripts/build/build-all.sh'
       - run:
           name: sha-sum packages
           command: 'go run build.go sha-dist'

emails/templates/layouts/default.html

@@ -107,7 +107,7 @@
 						            <table class="twelve columns">
 						              <tr>
 						                <td class="twelve sub-columns center">
-                              <img class="logo" src="http://grafana.org/assets/img/logo_new_transparent_200x48.png" style="width: 200px; float: none; display: inline">
+                              <img class="logo" src="1hskmz3i2o5bhic6pojfb512.wpengine.netdna-cdn.com/wp-content/uploads/2016/10/Natel_Energy_logo_blue.png" style="width: 200px; float: none; display: inline">
                             </td>
                             <td class="expander"></td>
                           </tr>
@@ -143,7 +143,7 @@
 											<center>
 												<p style="text-align: center; font-size: 12px; color: #999999;">
 													Sent by <a href="[[.AppUrl]]">Grafana v[[.BuildVersion]]</a>
-													<br />&copy; 2018 Grafana Labs
+													<br />&copy; 2019 Natel Energy
 												</p>
 											</center>
 										</td>

package.json

@@ -199,6 +199,7 @@
     "calculate-size": "1.1.1",
     "classnames": "2.2.6",
     "clipboard": "2.0.4",
+    "css-element-queries": "^1.1.1",
     "d3": "4.13.0",
     "d3-scale-chromatic": "1.3.3",
     "eventemitter3": "2.0.3",

pkg/api/login_oauth.go

@@ -71,6 +71,18 @@ func (hs *HTTPServer) OAuthLogin(ctx *m.ReqContext) {
 
 	cookieState := ctx.GetCookie(OauthStateCookieName)
 
+	// https://github.com/grafana/grafana/pull/7046
+	if cookieState == "" {
+		if ctx.Query("redirected") == "yes" {
+			//ctx.Handle(500, "login.OAuthLogin(missing saved state) after redirect", nil)
+			ctx.Redirect(setting.AppUrl)
+			return
+		}
+		loc := setting.AppUrl + "login/" + name + "?" + ctx.Req.URL.RawQuery + "&redirected=yes"
+		ctx.Redirect(loc)
+		return
+	}
+
 	// delete cookie
 	ctx.Resp.Header().Del("Set-Cookie")
 	hs.deleteCookie(ctx.Resp, OauthStateCookieName)

pkg/login/social/social.go

@@ -81,6 +81,7 @@ func NewOAuthService() {
 			TlsClientCa:                  sec.Key("tls_client_ca").String(),
 			TlsSkipVerify:                sec.Key("tls_skip_verify_insecure").MustBool(),
 			SendClientCredentialsViaPost: sec.Key("send_client_credentials_via_post").MustBool(),
+			RedirectUrl:                  sec.Key("redirect_url").String(),
 		}
 
 		if !info.Enabled {
@@ -105,7 +106,7 @@ func NewOAuthService() {
 				AuthURL:  info.AuthUrl,
 				TokenURL: info.TokenUrl,
 			},
-			RedirectURL: strings.TrimSuffix(setting.AppUrl, "/") + SocialBaseUrl + name,
+			RedirectURL: info.RedirectUrl,
 			Scopes:      info.Scopes,
 		}
 
@@ -192,6 +193,10 @@ func NewOAuthService() {
 				allowedOrganizations: util.SplitString(sec.Key("allowed_organizations").String()),
 			}
 		}
+
+		if len(config.RedirectURL) == 0 {
+			config.RedirectURL = strings.TrimSuffix(setting.AppUrl, "/") + SocialBaseUrl + name
+		}
 	}
 }
 

pkg/setting/setting_oauth.go

@@ -4,6 +4,7 @@ type OAuthInfo struct {
 	ClientId, ClientSecret       string
 	Scopes                       []string
 	AuthUrl, TokenUrl            string
+	RedirectUrl                  string
 	Enabled                      bool
 	EmailAttributeName           string
 	AllowedDomains               []string

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

@@ -1,5 +1,4 @@
 import React, { FC } from 'react';
-import { Tooltip } from '@grafana/ui';
 
 interface Props {
   appName: string;
@@ -16,37 +15,15 @@ export const Footer: FC<Props> = React.memo(
         <div className="text-center">
           <ul>
             <li>
-              <a href="http://docs.grafana.org" target="_blank">
-                <i className="fa fa-file-code-o" /> Docs
+              <a href="https://upstream.tech/" target="_blank">
+                Upstream Tech
               </a>
             </li>
             <li>
-              <a href="https://grafana.com/services/support" target="_blank">
-                <i className="fa fa-support" /> Support Plans
+              <a href="https://grafana.com" target="_blank" title={`(commit: ${buildCommit})`}>
+                v{buildVersion}
               </a>
             </li>
-            <li>
-              <a href="https://community.grafana.com/" target="_blank">
-                <i className="fa fa-comments-o" /> Community
-              </a>
-            </li>
-            <li>
-              <a href="https://grafana.com" target="_blank">
-                {appName}
-              </a>{' '}
-              <span>
-                v{buildVersion} (commit: {buildCommit})
-              </span>
-            </li>
-            {newGrafanaVersionExists && (
-              <li>
-                <Tooltip placement="auto" content={newGrafanaVersion}>
-                  <a href="https://grafana.com/get" target="_blank">
-                    New version available!
-                  </a>
-                </Tooltip>
-              </li>
-            )}
           </ul>
         </div>
       </footer>

public/app/core/components/OrgActionBar/OrgActionBar.tsx

@@ -14,7 +14,7 @@ export interface Props {
 export default class OrgActionBar extends PureComponent<Props> {
   render() {
     const { searchQuery, layoutMode, onSetLayoutMode, linkButton, setSearchQuery, target } = this.props;
-    const linkProps = { href: linkButton.href };
+    const linkProps = { href: linkButton ? linkButton.href : '#' };
 
     if (target) {
       (linkProps as any).target = target;
@@ -33,9 +33,11 @@ export default class OrgActionBar extends PureComponent<Props> {
           <LayoutSelector mode={layoutMode} onLayoutModeChanged={(mode: LayoutMode) => onSetLayoutMode(mode)} />
         </div>
         <div className="page-action-bar__spacer" />
-        <a className="btn btn-primary" {...linkProps}>
-          {linkButton.title}
-        </a>
+        {linkButton && (
+          <a className="btn btn-primary" {...linkProps}>
+            {linkButton.title}
+          </a>
+        )}
       </div>
     );
   }

public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap

@@ -159,35 +159,13 @@ exports[`ServerStats Should render table with stats 1`] = `
             <ul>
               <li>
                 <a
-                  href="http://docs.grafana.org"
+                  href="https://upstream.tech/"
                   target="_blank"
                 >
                   <i
                     className="fa fa-file-code-o"
                   />
-                   Docs
-                </a>
-              </li>
-              <li>
-                <a
-                  href="https://grafana.com/services/support"
-                  target="_blank"
-                >
-                  <i
-                    className="fa fa-support"
-                  />
-                   Support Plans
-                </a>
-              </li>
-              <li>
-                <a
-                  href="https://community.grafana.com/"
-                  target="_blank"
-                >
-                  <i
-                    className="fa fa-comments-o"
-                  />
-                   Community
+                   Upstream Tech
                 </a>
               </li>
               <li>

public/app/features/dashboard/services/ChangeTracker.ts

@@ -110,6 +110,7 @@ export class ChangeTracker {
     // ignore iteration property
     delete dash.iteration;
 
+    let hasDynamicHeight = false;
     dash.panels = _.filter(dash.panels, panel => {
       if (panel.repeatPanelId) {
         return false;
@@ -124,6 +125,15 @@ export class ChangeTracker {
         delete panel.legend.sortDesc;
       }
 
+      // ignore all y parameters after a dynamic height
+      if (panel.dynamicHeight) {
+        hasDynamicHeight = true;
+        delete panel.gridPos.h;
+      }
+      if (hasDynamicHeight) {
+        delete panel.gridPos.y;
+      }
+
       return true;
     });
 

public/app/features/panel/panel_ctrl.ts

@@ -14,7 +14,7 @@ import {
   calculateInnerPanelHeight,
 } from 'app/features/dashboard/utils/panel';
 
-import { GRID_COLUMN_COUNT } from 'app/core/constants';
+import { GRID_COLUMN_COUNT, GRID_CELL_HEIGHT, GRID_CELL_VMARGIN } from 'app/core/constants';
 
 export class PanelCtrl {
   panel: any;
@@ -63,6 +63,25 @@ export class PanelCtrl {
     profiler.renderingCompleted();
   }
 
+  dynamicHeightChanged(height: number): boolean {
+    const min = this.panel.dynamicHeightMIN || 50;
+    if (height < min) {
+      height = min;
+    }
+    if (this.panel.dynamicHeightMAX && height > this.panel.dynamicHeightMAX) {
+      height = this.panel.dynamicHeightMAX;
+    }
+    const h = Math.ceil((height + 5) / (GRID_CELL_HEIGHT + GRID_CELL_VMARGIN)) + 1;
+    if (h !== this.panel.gridPos.h) {
+      //console.log('Dynamic Height Changed', height, 'new:', h, 'old', this.panel.gridPos.h);
+      this.panel.gridPos.h = h;
+      this.events.emit('panel-size-changed');
+      this.dashboard.events.emit('row-expanded'); // triggers grid re-layout
+      return true;
+    }
+    return false;
+  }
+
   refresh() {
     this.panel.refresh();
   }

public/app/features/panel/panel_directive.ts

@@ -2,6 +2,7 @@ import angular from 'angular';
 import $ from 'jquery';
 import Drop from 'tether-drop';
 import baron from 'baron';
+import ResizeSensor from 'css-element-queries/src/ResizeSensor.js';
 
 const module = angular.module('grafana.directives');
 
@@ -40,6 +41,8 @@ module.directive('grafanaPanel', ($rootScope, $document, $timeout) => {
       const ctrl = scope.ctrl;
       let infoDrop;
       let panelScrollbar;
+      let panelInnerContent;
+      let panelInnerContentHeight = -1;
 
       // the reason for handling these classes this way is for performance
       // limit the watchers on panels etc
@@ -58,6 +61,16 @@ module.directive('grafanaPanel', ($rootScope, $document, $timeout) => {
         ctrl.dashboard.setPanelFocus(0);
       }
 
+      function checkInnerContentHeight() {
+        if (ctrl.panel.dynamicHeight && panelInnerContent) {
+          const v = panelInnerContent.outerHeight(true);
+          if (v !== panelInnerContentHeight) {
+            panelInnerContentHeight = v;
+            ctrl.dynamicHeightChanged(panelInnerContentHeight);
+          }
+        }
+      }
+
       function resizeScrollableContent() {
         if (panelScrollbar) {
           panelScrollbar.update();
@@ -82,7 +95,21 @@ module.directive('grafanaPanel', ($rootScope, $document, $timeout) => {
           `;
 
           const scrollRoot = panelContent;
-          const scroller = panelContent.find(':first').find(':first');
+          let scroller = panelContent.find(':first').find(':first');
+
+          // Add a div under the scroller and watch for changes
+          if (ctrl.panel.dynamicHeight) {
+            $(scroller).wrap('<div class="panel-height-helper"></div>');
+            scroller = panelContent.find(':first');
+
+            panelInnerContent = $(scroller).find(':first');
+            panelInnerContent.removeClass('panel-height-helper');
+            panelInnerContent.css('margin-right', '20px');
+            // panelInnerContent.css('border', '2px solid #F0F');
+
+            // tslint:disable-next-line
+            new ResizeSensor(panelInnerContent, checkInnerContentHeight);
+          }
 
           scrollRoot.addClass(scrollRootClass);
           $(scrollBarHTML).appendTo(scrollRoot);

public/app/features/panel/partials/general_tab.html

@@ -52,3 +52,21 @@
     <panel-links-editor panel="ctrl.panel"></panel-links-editor>
   </div>
 </div>
+
+
+<div class="panel-option-section">
+  <div class="panel-option-section__header">Height</div>
+  <div class="panel-option-section__body">
+    <gf-form-switch class="gf-form" label-class="width-7" switch-class="max-width-6" label="Dynamic" checked="ctrl.panel.dynamicHeight" on-change="ctrl.render()"></gf-form-switch>
+    <div class="gf-form" ng-if="ctrl.panel.dynamicHeight">
+      <span class="gf-form-label width-7">Minimum</span>
+      <input type="number" class="gf-form-input width-6" placeholder="10px" ng-model="ctrl.panel.dynamicHeightMIN"></input>
+    </div>
+    <div class="gf-form" ng-if="ctrl.panel.dynamicHeight">
+      <span class="gf-form-label width-7">Maximum</span>
+      <input type="number" class="gf-form-input width-6" placeholder="none" ng-model="ctrl.panel.dynamicHeightMAX"></input>
+    </div>
+  </div>
+</div>
+
+

public/app/features/plugins/PluginListPage.tsx

@@ -41,11 +41,6 @@ export class PluginListPage extends PureComponent<Props> {
       searchQuery,
     } = this.props;
 
-    const linkButton = {
-      href: 'https://grafana.com/plugins?utm_source=grafana_plugin_list',
-      title: 'Find more plugins on Grafana.com',
-    };
-
     return (
       <Page navModel={navModel}>
         <Page.Contents isLoading={!hasFetched}>
@@ -55,7 +50,7 @@ export class PluginListPage extends PureComponent<Props> {
               layoutMode={layoutMode}
               onSetLayoutMode={mode => setPluginsLayoutMode(mode)}
               setSearchQuery={query => setPluginsSearchQuery(query)}
-              linkButton={linkButton}
+              linkButton={null}
             />
             {hasFetched && plugins && (plugins && <PluginList plugins={plugins} layoutMode={layoutMode} />)}
           </>