diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html
index ca54acdd2060c..c6b433c6cbc75 100644
--- a/emails/templates/layouts/default.html
+++ b/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 />© 2018 Grafana Labs
+ <br />© 2019 Natel Energy
</p>
</center>
</td>
diff --git a/public/app/core/components/Footer/Footer.tsx b/public/app/core/components/Footer/Footer.tsx
index 45f7cc71131ca..3aa19a0426a06 100644
--- a/public/app/core/components/Footer/Footer.tsx
+++ b/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>
diff --git a/public/app/core/components/OrgActionBar/OrgActionBar.tsx b/public/app/core/components/OrgActionBar/OrgActionBar.tsx
index 016c477766863..5753240111b49 100644
--- a/public/app/core/components/OrgActionBar/OrgActionBar.tsx
+++ b/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>
);
}
diff --git a/public/app/features/plugins/PluginListPage.tsx b/public/app/features/plugins/PluginListPage.tsx
index 03d383fdec0ca..911cde2ebdf6e 100644
--- a/public/app/features/plugins/PluginListPage.tsx
+++ b/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} />)}
</>
diff --git a/public/img/grafana_icon.svg b/public/img/grafana_icon.svg
index 72702223dc77b..5eb8fef4e65e1 100644
--- a/public/img/grafana_icon.svg
+++ b/public/img/grafana_icon.svg
@@ -1,57 +1,2 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="351px" height="365px" viewBox="0 0 351 365" style="enable-background:new 0 0 351 365;" xml:space="preserve">
-<style type="text/css">
- .st0{fill:url(#SVGID_1_);}
-</style>
-<g id="Layer_1_1_">
-</g>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="175.5" y1="445.4948" x2="175.5" y2="114.0346">
- <stop offset="0" style="stop-color:#FFF100"/>
- <stop offset="1" style="stop-color:#F05A28"/>
-</linearGradient>
-<path class="st0" d="M342,161.2c-0.6-6.1-1.6-13.1-3.6-20.9c-2-7.7-5-16.2-9.4-25c-4.4-8.8-10.1-17.9-17.5-26.8
- c-2.9-3.5-6.1-6.9-9.5-10.2c5.1-20.3-6.2-37.9-6.2-37.9c-19.5-1.2-31.9,6.1-36.5,9.4c-0.8-0.3-1.5-0.7-2.3-1
- c-3.3-1.3-6.7-2.6-10.3-3.7c-3.5-1.1-7.1-2.1-10.8-3c-3.7-0.9-7.4-1.6-11.2-2.2c-0.7-0.1-1.3-0.2-2-0.3
- c-8.5-27.2-32.9-38.6-32.9-38.6c-27.3,17.3-32.4,41.5-32.4,41.5s-0.1,0.5-0.3,1.4c-1.5,0.4-3,0.9-4.5,1.3c-2.1,0.6-4.2,1.4-6.2,2.2
- c-2.1,0.8-4.1,1.6-6.2,2.5c-4.1,1.8-8.2,3.8-12.2,6c-3.9,2.2-7.7,4.6-11.4,7.1c-0.5-0.2-1-0.4-1-0.4c-37.8-14.4-71.3,2.9-71.3,2.9
- c-3.1,40.2,15.1,65.5,18.7,70.1c-0.9,2.5-1.7,5-2.5,7.5c-2.8,9.1-4.9,18.4-6.2,28.1c-0.2,1.4-0.4,2.8-0.5,4.2
- C18.8,192.7,8.5,228,8.5,228c29.1,33.5,63.1,35.6,63.1,35.6c0,0,0.1-0.1,0.1-0.1c4.3,7.7,9.3,15,14.9,21.9c2.4,2.9,4.8,5.6,7.4,8.3
- c-10.6,30.4,1.5,55.6,1.5,55.6c32.4,1.2,53.7-14.2,58.2-17.7c3.2,1.1,6.5,2.1,9.8,2.9c10,2.6,20.2,4.1,30.4,4.5
- c2.5,0.1,5.1,0.2,7.6,0.1l1.2,0l0.8,0l1.6,0l1.6-0.1l0,0.1c15.3,21.8,42.1,24.9,42.1,24.9c19.1-20.1,20.2-40.1,20.2-44.4l0,0
- c0,0,0-0.1,0-0.3c0-0.4,0-0.6,0-0.6l0,0c0-0.3,0-0.6,0-0.9c4-2.8,7.8-5.8,11.4-9.1c7.6-6.9,14.3-14.8,19.9-23.3
- c0.5-0.8,1-1.6,1.5-2.4c21.6,1.2,36.9-13.4,36.9-13.4c-3.6-22.5-16.4-33.5-19.1-35.6l0,0c0,0-0.1-0.1-0.3-0.2
- c-0.2-0.1-0.2-0.2-0.2-0.2c0,0,0,0,0,0c-0.1-0.1-0.3-0.2-0.5-0.3c0.1-1.4,0.2-2.7,0.3-4.1c0.2-2.4,0.2-4.9,0.2-7.3l0-1.8l0-0.9
- l0-0.5c0-0.6,0-0.4,0-0.6l-0.1-1.5l-0.1-2c0-0.7-0.1-1.3-0.2-1.9c-0.1-0.6-0.1-1.3-0.2-1.9l-0.2-1.9l-0.3-1.9
- c-0.4-2.5-0.8-4.9-1.4-7.4c-2.3-9.7-6.1-18.9-11-27.2c-5-8.3-11.2-15.6-18.3-21.8c-7-6.2-14.9-11.2-23.1-14.9
- c-8.3-3.7-16.9-6.1-25.5-7.2c-4.3-0.6-8.6-0.8-12.9-0.7l-1.6,0l-0.4,0c-0.1,0-0.6,0-0.5,0l-0.7,0l-1.6,0.1c-0.6,0-1.2,0.1-1.7,0.1
- c-2.2,0.2-4.4,0.5-6.5,0.9c-8.6,1.6-16.7,4.7-23.8,9c-7.1,4.3-13.3,9.6-18.3,15.6c-5,6-8.9,12.7-11.6,19.6c-2.7,6.9-4.2,14.1-4.6,21
- c-0.1,1.7-0.1,3.5-0.1,5.2c0,0.4,0,0.9,0,1.3l0.1,1.4c0.1,0.8,0.1,1.7,0.2,2.5c0.3,3.5,1,6.9,1.9,10.1c1.9,6.5,4.9,12.4,8.6,17.4
- c3.7,5,8.2,9.1,12.9,12.4c4.7,3.2,9.8,5.5,14.8,7c5,1.5,10,2.1,14.7,2.1c0.6,0,1.2,0,1.7,0c0.3,0,0.6,0,0.9,0c0.3,0,0.6,0,0.9-0.1
- c0.5,0,1-0.1,1.5-0.1c0.1,0,0.3,0,0.4-0.1l0.5-0.1c0.3,0,0.6-0.1,0.9-0.1c0.6-0.1,1.1-0.2,1.7-0.3c0.6-0.1,1.1-0.2,1.6-0.4
- c1.1-0.2,2.1-0.6,3.1-0.9c2-0.7,4-1.5,5.7-2.4c1.8-0.9,3.4-2,5-3c0.4-0.3,0.9-0.6,1.3-1c1.6-1.3,1.9-3.7,0.6-5.3
- c-1.1-1.4-3.1-1.8-4.7-0.9c-0.4,0.2-0.8,0.4-1.2,0.6c-1.4,0.7-2.8,1.3-4.3,1.8c-1.5,0.5-3.1,0.9-4.7,1.2c-0.8,0.1-1.6,0.2-2.5,0.3
- c-0.4,0-0.8,0.1-1.3,0.1c-0.4,0-0.9,0-1.2,0c-0.4,0-0.8,0-1.2,0c-0.5,0-1,0-1.5-0.1c0,0-0.3,0-0.1,0l-0.2,0l-0.3,0
- c-0.2,0-0.5,0-0.7-0.1c-0.5-0.1-0.9-0.1-1.4-0.2c-3.7-0.5-7.4-1.6-10.9-3.2c-3.6-1.6-7-3.8-10.1-6.6c-3.1-2.8-5.8-6.1-7.9-9.9
- c-2.1-3.8-3.6-8-4.3-12.4c-0.3-2.2-0.5-4.5-0.4-6.7c0-0.6,0.1-1.2,0.1-1.8c0,0.2,0-0.1,0-0.1l0-0.2l0-0.5c0-0.3,0.1-0.6,0.1-0.9
- c0.1-1.2,0.3-2.4,0.5-3.6c1.7-9.6,6.5-19,13.9-26.1c1.9-1.8,3.9-3.4,6-4.9c2.1-1.5,4.4-2.8,6.8-3.9c2.4-1.1,4.8-2,7.4-2.7
- c2.5-0.7,5.1-1.1,7.8-1.4c1.3-0.1,2.6-0.2,4-0.2c0.4,0,0.6,0,0.9,0l1.1,0l0.7,0c0.3,0,0,0,0.1,0l0.3,0l1.1,0.1
- c2.9,0.2,5.7,0.6,8.5,1.3c5.6,1.2,11.1,3.3,16.2,6.1c10.2,5.7,18.9,14.5,24.2,25.1c2.7,5.3,4.6,11,5.5,16.9c0.2,1.5,0.4,3,0.5,4.5
- l0.1,1.1l0.1,1.1c0,0.4,0,0.8,0,1.1c0,0.4,0,0.8,0,1.1l0,1l0,1.1c0,0.7-0.1,1.9-0.1,2.6c-0.1,1.6-0.3,3.3-0.5,4.9
- c-0.2,1.6-0.5,3.2-0.8,4.8c-0.3,1.6-0.7,3.2-1.1,4.7c-0.8,3.1-1.8,6.2-3,9.3c-2.4,6-5.6,11.8-9.4,17.1
- c-7.7,10.6-18.2,19.2-30.2,24.7c-6,2.7-12.3,4.7-18.8,5.7c-3.2,0.6-6.5,0.9-9.8,1l-0.6,0l-0.5,0l-1.1,0l-1.6,0l-0.8,0
- c0.4,0-0.1,0-0.1,0l-0.3,0c-1.8,0-3.5-0.1-5.3-0.3c-7-0.5-13.9-1.8-20.7-3.7c-6.7-1.9-13.2-4.6-19.4-7.8
- c-12.3-6.6-23.4-15.6-32-26.5c-4.3-5.4-8.1-11.3-11.2-17.4c-3.1-6.1-5.6-12.6-7.4-19.1c-1.8-6.6-2.9-13.3-3.4-20.1l-0.1-1.3l0-0.3
- l0-0.3l0-0.6l0-1.1l0-0.3l0-0.4l0-0.8l0-1.6l0-0.3c0,0,0,0.1,0-0.1l0-0.6c0-0.8,0-1.7,0-2.5c0.1-3.3,0.4-6.8,0.8-10.2
- c0.4-3.4,1-6.9,1.7-10.3c0.7-3.4,1.5-6.8,2.5-10.2c1.9-6.7,4.3-13.2,7.1-19.3c5.7-12.2,13.1-23.1,22-31.8c2.2-2.2,4.5-4.2,6.9-6.2
- c2.4-1.9,4.9-3.7,7.5-5.4c2.5-1.7,5.2-3.2,7.9-4.6c1.3-0.7,2.7-1.4,4.1-2c0.7-0.3,1.4-0.6,2.1-0.9c0.7-0.3,1.4-0.6,2.1-0.9
- c2.8-1.2,5.7-2.2,8.7-3.1c0.7-0.2,1.5-0.4,2.2-0.7c0.7-0.2,1.5-0.4,2.2-0.6c1.5-0.4,3-0.8,4.5-1.1c0.7-0.2,1.5-0.3,2.3-0.5
- c0.8-0.2,1.5-0.3,2.3-0.5c0.8-0.1,1.5-0.3,2.3-0.4l1.1-0.2l1.2-0.2c0.8-0.1,1.5-0.2,2.3-0.3c0.9-0.1,1.7-0.2,2.6-0.3
- c0.7-0.1,1.9-0.2,2.6-0.3c0.5-0.1,1.1-0.1,1.6-0.2l1.1-0.1l0.5-0.1l0.6,0c0.9-0.1,1.7-0.1,2.6-0.2l1.3-0.1c0,0,0.5,0,0.1,0l0.3,0
- l0.6,0c0.7,0,1.5-0.1,2.2-0.1c2.9-0.1,5.9-0.1,8.8,0c5.8,0.2,11.5,0.9,17,1.9c11.1,2.1,21.5,5.6,31,10.3
- c9.5,4.6,17.9,10.3,25.3,16.5c0.5,0.4,0.9,0.8,1.4,1.2c0.4,0.4,0.9,0.8,1.3,1.2c0.9,0.8,1.7,1.6,2.6,2.4c0.9,0.8,1.7,1.6,2.5,2.4
- c0.8,0.8,1.6,1.6,2.4,2.5c3.1,3.3,6,6.6,8.6,10c5.2,6.7,9.4,13.5,12.7,19.9c0.2,0.4,0.4,0.8,0.6,1.2c0.2,0.4,0.4,0.8,0.6,1.2
- c0.4,0.8,0.8,1.6,1.1,2.4c0.4,0.8,0.7,1.5,1.1,2.3c0.3,0.8,0.7,1.5,1,2.3c1.2,3,2.4,5.9,3.3,8.6c1.5,4.4,2.6,8.3,3.5,11.7
- c0.3,1.4,1.6,2.3,3,2.1c1.5-0.1,2.6-1.3,2.6-2.8C342.6,170.4,342.5,166.1,342,161.2z"/>
-</svg>
+
+<svg width="40" height="40" xmlns="http://www.w3.org/2000/svg"><path d="M20 0C8.938 0 0 8.946 0 19.982 0 31.017 8.938 40 20 40c2.784 0 5.458-.587 7.839-1.613.22-.11.44-.184.66-.294.219-.11.439-.183.622-.293l-1.355-.696-1.869-2.457 2.015-3.96 3.077.037 4.286 2.163c.11-.146.256-.293.366-.44.11-.146.22-.293.366-.44A20.056 20.056 0 0 0 40 20.018C39.963 8.946 31.026 0 20 0zm-5.128 30.577L3.736 24.931l3.224-6.38 11.135 5.647 1.868 2.456-2.014 3.96-3.077-.037zm12.71-3.263l-3.406 6.71c-.147.256-.366.476-.66.55-.293.11-.586.073-.879-.074l-2.674-1.356c-.55-.293-.805-.953-.512-1.54l3.443-6.673a1.29 1.29 0 0 1 .66-.586c.292-.074.585-.074.878.073l2.674 1.357c.513.293.733.99.476 1.54zm4.652-2.016a.59.59 0 0 1-.33.11.522.522 0 0 1-.439-.22 11.73 11.73 0 0 0-3.992-3.336 11.324 11.324 0 0 0-5.202-1.247h-.073a.564.564 0 0 1-.55-.55c0-.293.257-.55.55-.55 2.014 0 3.992.477 5.787 1.357a12.65 12.65 0 0 1 4.36 3.63c.146.256.11.623-.11.806zm1.905-1.833a.59.59 0 0 1-.33.11.522.522 0 0 1-.439-.22c-1.282-1.613-2.857-2.933-4.725-3.85a13.57 13.57 0 0 0-6.227-1.503.564.564 0 0 1-.55-.55c0-.293.257-.55.55-.55a15.22 15.22 0 0 1 6.703 1.65 15.218 15.218 0 0 1 5.091 4.18c.22.183.147.55-.073.733zm2.051-1.76a.59.59 0 0 1-.33.11.522.522 0 0 1-.439-.22c-1.502-1.907-3.37-3.41-5.568-4.51a16.662 16.662 0 0 0-7.326-1.833.564.564 0 0 1-.549-.55c0-.293.256-.55.55-.55 2.747.037 5.384.697 7.838 1.943 2.308 1.174 4.323 2.787 5.934 4.803.184.257.147.624-.11.807z" fill="#004C5C"/></svg>
diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss
index 6b2fa95730e0a..edcefa44e82db 100644
--- a/public/sass/layout/_page.scss
+++ b/public/sass/layout/_page.scss
@@ -41,7 +41,7 @@
margin-right: auto;
padding-left: $spacer * 2;
padding-right: $spacer * 2;
- max-width: 980px;
+ max-width: 100%;
@include clearfix();
}
diff --git a/public/views/index-template.html b/public/views/index-template.html
index fa19ae599dd20..1e5a582415f4f 100644
--- a/public/views/index-template.html
+++ b/public/views/index-template.html
@@ -198,34 +198,16 @@
<div class="text-center">
<ul>
<li>
- <a href="http://docs.grafana.org" target="_blank">
- <i class="fa fa-file-code-o"></i>
- Docs
+ <a href="https://upstream.tech/" target="_blank">
+ Upstream Tech
</a>
</li>
<li>
- <a href="https://grafana.com/services/support" target="_blank">
- <i class="fa fa-support"></i>
- 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 class="fa fa-comments-o"></i>
- Community
- </a>
- </li>
- <li>
- <a href="https://grafana.com" target="_blank">[[.AppName]]</a>
- <span>v[[.BuildVersion]] (commit: [[.BuildCommit]])</span>
- </li>
- [[if .NewGrafanaVersionExists]]
- <li>
- <a href="https://grafana.com/get" target="_blank" bs-tooltip="'[[.NewGrafanaVersion]]'">
- New version available!
- </a>
- </li>
- [[end]]
</ul>
</div>
</footer>
diff --git a/scripts/grunt/options/exec.js b/scripts/grunt/options/exec.js
index 3296abecfd4a9..fa983e426ba5c 100644
--- a/scripts/grunt/options/exec.js
+++ b/scripts/grunt/options/exec.js
@@ -18,7 +18,7 @@ module.exports = function(config, grunt) {
command: 'yarn run typecheck',
src: ['public/app/**/*.ts*'],
},
- jest: 'node ./node_modules/jest-cli/bin/jest.js --maxWorkers 2',
+ jest: 'node ./node_modules/jest-cli/bin/jest.js --updateSnapshot --maxWorkers 2',
webpack:
'node ./node_modules/webpack/bin/webpack.js --config scripts/webpack/webpack.prod.js',
};