Commit 151e950e by Torkel Ödegaard

Merge branch 'master' into 12918-only-arrow-functions

parents 0e007d57 72ab24f3
......@@ -5,6 +5,7 @@
* **Alerting**: Notification reminders [#7330](https://github.com/grafana/grafana/issues/7330), thx [@jbaublitz](https://github.com/jbaublitz)
* **Dashboard**: TV & Kiosk mode changes, new cycle view mode button in dashboard toolbar [#13025](https://github.com/grafana/grafana/pull/13025)
* **OAuth**: Gitlab OAuth with support for filter by groups [#5623](https://github.com/grafana/grafana/issues/5623), thx [@BenoitKnecht](https://github.com/BenoitKnecht)
* **Postgres**: Graphical query builder [#10095](https://github.com/grafana/grafana/issues/10095), thx [svenklemm](https://github.com/svenklemm)
### New Features
......@@ -19,7 +20,9 @@
### Minor
* **Units**: Adds bitcoin axes unit. [#13125](https://github.com/grafana/grafana/pull/13125)
* **GrafanaCli**: Fixed issue with grafana-cli install plugin resulting in corrupt http response from source error. Fixes [#13079](https://github.com/grafana/grafana/issues/13079)
* **Logging**: Reopen log files after receiving a SIGHUP signal [#13112](https://github.com/grafana/grafana/pull/13112), thx [@filewalkwithme](https://github.com/filewalkwithme)
* **Api**: Delete nonexistent datasource should return 404 [#12313](https://github.com/grafana/grafana/issues/12313), thx [@AustinWinstanley](https://github.com/AustinWinstanley)
* **Dashboard**: Fix selecting current dashboard from search should not reload dashboard [#12248](https://github.com/grafana/grafana/issues/12248)
* **Dashboard**: Use uid when linking to dashboards internally in a dashboard [#10705](https://github.com/grafana/grafana/issues/10705)
......
......@@ -538,3 +538,8 @@ container_name =
[external_image_storage.local]
# does not require any configuration
[rendering]
# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
server_url =
callback_url =
......@@ -460,3 +460,8 @@ log_queries =
[external_image_storage.local]
# does not require any configuration
[rendering]
# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
;server_url =
;callback_url =
......@@ -155,7 +155,7 @@ Since not all datasources have the same configuration settings we only have the
| tlsSkipVerify | boolean | *All* | Controls whether a client verifies the server's certificate chain and host name. |
| graphiteVersion | string | Graphite | Graphite version |
| timeInterval | string | Elastic, InfluxDB & Prometheus | Lowest interval/step value that should be used for this data source |
| esVersion | number | Elastic | Elasticsearch version as an number (2/5/56) |
| esVersion | number | Elastic | Elasticsearch version as a number (2/5/56) |
| timeField | string | Elastic | Which field that should be used as timestamp |
| interval | string | Elastic | Index date time format |
| authType | string | Cloudwatch | Auth provider. keys/credentials/arn |
......@@ -165,6 +165,8 @@ Since not all datasources have the same configuration settings we only have the
| tsdbVersion | string | OpenTSDB | Version |
| tsdbResolution | string | OpenTSDB | Resolution |
| sslmode | string | PostgreSQL | SSLmode. 'disable', 'require', 'verify-ca' or 'verify-full' |
| postgresVersion | number | PostgreSQL | Postgres version as a number (903/904/905/906/1000) meaning v9.3, v9.4, ..., v10 |
| timescaledb | boolean | PostgreSQL | Enable usage of TimescaleDB extension |
#### Secure Json Data
......
......@@ -31,7 +31,9 @@ Name | Description
*User* | Database user's login/username
*Password* | Database user's password
*SSL Mode* | This option determines whether or with what priority a secure SSL TCP/IP connection will be negotiated with the server.
*TimescaleDB* | With this option enabled Grafana will use TimescaleDB features, e.g. use ```time_bucket``` for grouping by time (only available in Grafana 5.3+).
*Version* | This option determines which functions are available in the query builder (only available in Grafana 5.3+).
*TimescaleDB* | TimescaleDB is a time-series database built as a PostgreSQL extension. If enabled, Grafana will use `time_bucket` in the `$__timeGroup` macro and display TimescaleDB specific aggregate functions in the query builder (only available in Grafana 5.3+).
### Database User Permissions (Important!)
......@@ -292,5 +294,6 @@ datasources:
password: "Password!"
jsonData:
sslmode: "disable" # disable/require/verify-ca/verify-full
postgresVersion: 903 # 903=9.3, 904=9.4, 905=9.5, 906=9.6, 1000=10
timescaledb: false
```
......@@ -96,13 +96,17 @@ func main() {
func listenToSystemSignals(server *GrafanaServerImpl) {
signalChan := make(chan os.Signal, 1)
ignoreChan := make(chan os.Signal, 1)
sighupChan := make(chan os.Signal, 1)
signal.Notify(ignoreChan, syscall.SIGHUP)
signal.Notify(sighupChan, syscall.SIGHUP)
signal.Notify(signalChan, os.Interrupt, os.Kill, syscall.SIGTERM)
select {
case sig := <-signalChan:
server.Shutdown(fmt.Sprintf("System signal: %s", sig))
for {
select {
case _ = <-sighupChan:
log.Reload()
case sig := <-signalChan:
server.Shutdown(fmt.Sprintf("System signal: %s", sig))
}
}
}
......@@ -236,3 +236,20 @@ func (w *FileLogWriter) Close() {
func (w *FileLogWriter) Flush() {
w.mw.fd.Sync()
}
// Reload file logger
func (w *FileLogWriter) Reload() {
// block Logger's io.Writer
w.mw.Lock()
defer w.mw.Unlock()
// Close
fd := w.mw.fd
fd.Close()
// Open again
err := w.StartLogger()
if err != nil {
fmt.Fprintf(os.Stderr, "Reload StartLogger: %s\n", err)
}
}
......@@ -3,3 +3,7 @@ package log
type DisposableHandler interface {
Close()
}
type ReloadableHandler interface {
Reload()
}
......@@ -21,10 +21,12 @@ import (
var Root log15.Logger
var loggersToClose []DisposableHandler
var loggersToReload []ReloadableHandler
var filters map[string]log15.Lvl
func init() {
loggersToClose = make([]DisposableHandler, 0)
loggersToReload = make([]ReloadableHandler, 0)
Root = log15.Root()
Root.SetHandler(log15.DiscardHandler())
}
......@@ -115,6 +117,12 @@ func Close() {
loggersToClose = make([]DisposableHandler, 0)
}
func Reload() {
for _, logger := range loggersToReload {
logger.Reload()
}
}
func GetLogLevelFor(name string) Lvl {
if level, ok := filters[name]; ok {
switch level {
......@@ -230,6 +238,7 @@ func ReadLoggingConfig(modes []string, logsPath string, cfg *ini.File) {
fileHandler.Init()
loggersToClose = append(loggersToClose, fileHandler)
loggersToReload = append(loggersToReload, fileHandler)
handler = fileHandler
case "syslog":
sysLogHandler := NewSyslog(sec, format)
......
......@@ -2,6 +2,7 @@ package rendering
import (
"context"
"fmt"
"io"
"net"
"net/http"
......@@ -20,14 +21,13 @@ var netTransport = &http.Transport{
TLSHandshakeTimeout: 5 * time.Second,
}
var netClient = &http.Client{
Transport: netTransport,
}
func (rs *RenderingService) renderViaHttp(ctx context.Context, opts Opts) (*RenderResult, error) {
filePath := rs.getFilePathForNewImage()
var netClient = &http.Client{
Timeout: opts.Timeout,
Transport: netTransport,
}
rendererUrl, err := url.Parse(rs.Cfg.RendererUrl)
if err != nil {
return nil, err
......@@ -35,10 +35,10 @@ func (rs *RenderingService) renderViaHttp(ctx context.Context, opts Opts) (*Rend
queryParams := rendererUrl.Query()
queryParams.Add("url", rs.getURL(opts.Path))
queryParams.Add("renderKey", rs.getRenderKey(opts.UserId, opts.OrgId, opts.OrgRole))
queryParams.Add("renderKey", rs.getRenderKey(opts.OrgId, opts.UserId, opts.OrgRole))
queryParams.Add("width", strconv.Itoa(opts.Width))
queryParams.Add("height", strconv.Itoa(opts.Height))
queryParams.Add("domain", rs.getLocalDomain())
queryParams.Add("domain", rs.domain)
queryParams.Add("timezone", isoTimeOffsetToPosixTz(opts.Timezone))
queryParams.Add("encoding", opts.Encoding)
queryParams.Add("timeout", strconv.Itoa(int(opts.Timeout.Seconds())))
......@@ -49,20 +49,48 @@ func (rs *RenderingService) renderViaHttp(ctx context.Context, opts Opts) (*Rend
return nil, err
}
reqContext, cancel := context.WithTimeout(ctx, opts.Timeout+time.Second*2)
defer cancel()
req = req.WithContext(reqContext)
// make request to renderer server
resp, err := netClient.Do(req)
if err != nil {
return nil, err
rs.log.Error("Failed to send request to remote rendering service.", "error", err)
return nil, fmt.Errorf("Failed to send request to remote rendering service. %s", err)
}
// save response to file
defer resp.Body.Close()
// check for timeout first
if reqContext.Err() == context.DeadlineExceeded {
rs.log.Info("Rendering timed out")
return nil, ErrTimeout
}
// if we didnt get a 200 response, something went wrong.
if resp.StatusCode != http.StatusOK {
rs.log.Error("Remote rendering request failed", "error", resp.Status)
return nil, fmt.Errorf("Remote rendering request failed. %d: %s", resp.StatusCode, resp.Status)
}
out, err := os.Create(filePath)
if err != nil {
return nil, err
}
defer out.Close()
io.Copy(out, resp.Body)
_, err = io.Copy(out, resp.Body)
if err != nil {
// check that we didnt timeout while receiving the response.
if reqContext.Err() == context.DeadlineExceeded {
rs.log.Info("Rendering timed out")
return nil, ErrTimeout
}
rs.log.Error("Remote rendering request failed", "error", err)
return nil, fmt.Errorf("Remote rendering request failed. %s", err)
}
return &RenderResult{FilePath: filePath}, err
}
......@@ -49,7 +49,7 @@ func (rs *RenderingService) renderViaPhantomJS(ctx context.Context, opts Opts) (
fmt.Sprintf("width=%v", opts.Width),
fmt.Sprintf("height=%v", opts.Height),
fmt.Sprintf("png=%v", pngPath),
fmt.Sprintf("domain=%v", rs.getLocalDomain()),
fmt.Sprintf("domain=%v", rs.domain),
fmt.Sprintf("timeout=%v", opts.Timeout.Seconds()),
fmt.Sprintf("renderKey=%v", renderKey),
}
......
......@@ -77,10 +77,10 @@ func (rs *RenderingService) renderViaPlugin(ctx context.Context, opts Opts) (*Re
Height: int32(opts.Height),
FilePath: pngPath,
Timeout: int32(opts.Timeout.Seconds()),
RenderKey: rs.getRenderKey(opts.UserId, opts.OrgId, opts.OrgRole),
RenderKey: rs.getRenderKey(opts.OrgId, opts.UserId, opts.OrgRole),
Encoding: opts.Encoding,
Timezone: isoTimeOffsetToPosixTz(opts.Timezone),
Domain: rs.getLocalDomain(),
Domain: rs.domain,
})
if err != nil {
......
......@@ -3,6 +3,8 @@ package rendering
import (
"context"
"fmt"
"net/url"
"os"
"path/filepath"
plugin "github.com/hashicorp/go-plugin"
......@@ -27,12 +29,31 @@ type RenderingService struct {
grpcPlugin pluginModel.RendererPlugin
pluginInfo *plugins.RendererPlugin
renderAction renderFunc
domain string
Cfg *setting.Cfg `inject:""`
}
func (rs *RenderingService) Init() error {
rs.log = log.New("rendering")
// ensure ImagesDir exists
err := os.MkdirAll(rs.Cfg.ImagesDir, 0700)
if err != nil {
return err
}
// set value used for domain attribute of renderKey cookie
if rs.Cfg.RendererUrl != "" {
// RendererCallbackUrl has already been passed, it wont generate an error.
u, _ := url.Parse(rs.Cfg.RendererCallbackUrl)
rs.domain = u.Hostname()
} else if setting.HttpAddr != setting.DEFAULT_HTTP_ADDR {
rs.domain = setting.HttpAddr
} else {
rs.domain = "localhost"
}
return nil
}
......@@ -82,16 +103,17 @@ func (rs *RenderingService) getFilePathForNewImage() string {
}
func (rs *RenderingService) getURL(path string) string {
// &render=1 signals to the legacy redirect layer to
return fmt.Sprintf("%s://%s:%s/%s&render=1", setting.Protocol, rs.getLocalDomain(), setting.HttpPort, path)
}
if rs.Cfg.RendererUrl != "" {
// The backend rendering service can potentially be remote.
// So we need to use the root_url to ensure the rendering service
// can reach this Grafana instance.
func (rs *RenderingService) getLocalDomain() string {
if setting.HttpAddr != setting.DEFAULT_HTTP_ADDR {
return setting.HttpAddr
}
// &render=1 signals to the legacy redirect layer to
return fmt.Sprintf("%s%s&render=1", rs.Cfg.RendererCallbackUrl, path)
return "localhost"
}
// &render=1 signals to the legacy redirect layer to
return fmt.Sprintf("%s://%s:%s/%s&render=1", setting.Protocol, rs.domain, setting.HttpPort, path)
}
func (rs *RenderingService) getRenderKey(orgId, userId int64, orgRole models.RoleType) string {
......
......@@ -197,6 +197,7 @@ type Cfg struct {
ImagesDir string
PhantomDir string
RendererUrl string
RendererCallbackUrl string
DisableBruteForceLoginProtection bool
TempDataLifetime time.Duration
......@@ -641,6 +642,18 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
// Rendering
renderSec := iniFile.Section("rendering")
cfg.RendererUrl = renderSec.Key("server_url").String()
cfg.RendererCallbackUrl = renderSec.Key("callback_url").String()
if cfg.RendererCallbackUrl == "" {
cfg.RendererCallbackUrl = AppUrl
} else {
if cfg.RendererCallbackUrl[len(cfg.RendererCallbackUrl)-1] != '/' {
cfg.RendererCallbackUrl += "/"
}
_, err := url.Parse(cfg.RendererCallbackUrl)
if err != nil {
log.Fatal(4, "Invalid callback_url(%s): %s", cfg.RendererCallbackUrl, err)
}
}
cfg.ImagesDir = filepath.Join(DataPath, "png")
cfg.PhantomDir = filepath.Join(HomePath, "tools/phantomjs")
cfg.TempDataLifetime = iniFile.Section("paths").Key("temp_data_lifetime").MustDuration(time.Second * 3600 * 24)
......
......@@ -20,6 +20,7 @@ func TestLoadingSettings(t *testing.T) {
So(err, ShouldBeNil)
So(AdminUser, ShouldEqual, "admin")
So(cfg.RendererCallbackUrl, ShouldEqual, "http://localhost:3000/")
})
Convey("Should be able to override via environment variables", func() {
......@@ -178,5 +179,15 @@ func TestLoadingSettings(t *testing.T) {
So(InstanceName, ShouldEqual, hostname)
})
Convey("Reading callback_url should add trailing slash", func() {
cfg := NewCfg()
cfg.Load(&CommandLineArgs{
HomePath: "../../",
Args: []string{"cfg:rendering.callback_url=http://myserver/renderer"},
})
So(cfg.RendererCallbackUrl, ShouldEqual, "http://myserver/renderer/")
})
})
}
......@@ -21,7 +21,7 @@ import _ from 'lodash';
import moment from 'moment';
// add move to lodash for backward compatabiltiy
_.move = function(array, fromIndex, toIndex) {
_.move = (array, fromIndex, toIndex) => {
array.splice(toIndex, 0, array.splice(fromIndex, 1)[0]);
return array;
};
......@@ -76,9 +76,9 @@ export class GrafanaApp {
$provide.decorator('$http', [
'$delegate',
'$templateCache',
function($delegate, $templateCache) {
($delegate, $templateCache) => {
const get = $delegate.get;
$delegate.get = function(url, config) {
$delegate.get = (url, config) => {
if (url.match(/\.html$/)) {
// some template's already exist in the cache
if (!$templateCache.get(url)) {
......@@ -135,7 +135,7 @@ export class GrafanaApp {
this.preBootModules = null;
});
})
.catch(function(err) {
.catch(err => {
console.log('Application boot failed:', err);
});
}
......
......@@ -4,7 +4,7 @@ export default function debounce(func, wait) {
return function(this: any) {
const context = this;
const args = arguments;
const later = function() {
const later = () => {
timeout = null;
func.apply(context, args);
};
......
......@@ -6,6 +6,7 @@ import { NavStore } from 'app/stores/NavStore/NavStore';
import { TeamsStore, Team } from 'app/stores/TeamsStore/TeamsStore';
import { BackendSrv } from 'app/core/services/backend_srv';
import DeleteButton from 'app/core/components/DeleteButton/DeleteButton';
import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
interface Props {
nav: typeof NavStore.Type;
......@@ -61,48 +62,81 @@ export class TeamList extends React.Component<Props, any> {
);
}
renderTeamList(teams) {
return (
<div className="page-container page-body">
<div className="page-action-bar">
<div className="gf-form gf-form--grow">
<label className="gf-form--has-input-icon gf-form--grow">
<input
type="text"
className="gf-form-input"
placeholder="Search teams"
value={teams.search}
onChange={this.onSearchQueryChange}
/>
<i className="gf-form-input-icon fa fa-search" />
</label>
</div>
<div className="page-action-bar__spacer" />
<a className="btn btn-success" href="org/teams/new">
<i className="fa fa-plus" /> New team
</a>
</div>
<div className="admin-list-table">
<table className="filter-table filter-table--hover form-inline">
<thead>
<tr>
<th />
<th>Name</th>
<th>Email</th>
<th>Members</th>
<th style={{ width: '1%' }} />
</tr>
</thead>
<tbody>{teams.filteredTeams.map(team => this.renderTeamMember(team))}</tbody>
</table>
</div>
</div>
);
}
renderEmptyList() {
return (
<div className="page-container page-body">
<EmptyListCTA
model={{
title: "You haven't created any teams yet.",
buttonIcon: 'fa fa-plus',
buttonLink: 'org/teams/new',
buttonTitle: ' New team',
proTip: 'Assign folder and dashboard permissions to teams instead of users to ease administration.',
proTipLink: '',
proTipLinkTitle: '',
proTipTarget: '_blank',
}}
/>
</div>
);
}
render() {
const { nav, teams } = this.props;
let view;
if (teams.filteredTeams.length > 0) {
view = this.renderTeamList(teams);
} else {
view = this.renderEmptyList();
}
return (
<div>
<PageHeader model={nav as any} />
<div className="page-container page-body">
<div className="page-action-bar">
<div className="gf-form gf-form--grow">
<label className="gf-form--has-input-icon gf-form--grow">
<input
type="text"
className="gf-form-input"
placeholder="Search teams"
value={teams.search}
onChange={this.onSearchQueryChange}
/>
<i className="gf-form-input-icon fa fa-search" />
</label>
</div>
<div className="page-action-bar__spacer" />
<a className="btn btn-success" href="org/teams/new">
<i className="fa fa-plus" /> New team
</a>
</div>
<div className="admin-list-table">
<table className="filter-table filter-table--hover form-inline">
<thead>
<tr>
<th />
<th>Name</th>
<th>Email</th>
<th>Members</th>
<th style={{ width: '1%' }} />
</tr>
</thead>
<tbody>{teams.filteredTeams.map(team => this.renderTeamMember(team))}</tbody>
</table>
</div>
</div>
{view}
</div>
);
}
......
......@@ -4,10 +4,12 @@ import PageHeader from './components/PageHeader/PageHeader';
import EmptyListCTA from './components/EmptyListCTA/EmptyListCTA';
import { SearchResult } from './components/search/SearchResult';
import { TagFilter } from './components/TagFilter/TagFilter';
import { SideMenu } from './components/sidemenu/SideMenu';
import DashboardPermissions from './components/Permissions/DashboardPermissions';
export function registerAngularDirectives() {
react2AngularDirective('passwordStrength', PasswordStrength, ['password']);
react2AngularDirective('sidemenu', SideMenu, []);
react2AngularDirective('pageHeader', PageHeader, ['model', 'noTabs']);
react2AngularDirective('emptyListCta', EmptyListCTA, ['model']);
react2AngularDirective('searchResult', SearchResult, []);
......
......@@ -31,7 +31,7 @@ export function gfPageDirective() {
header: '?gfPageHeader',
body: 'gfPageBody',
},
link: function(scope, elem, attrs) {
link: (scope, elem, attrs) => {
console.log(scope);
},
};
......
......@@ -4,7 +4,7 @@ import appEvents from 'app/core/app_events';
export function pageScrollbar() {
return {
restrict: 'A',
link: function(scope, elem, attrs) {
link: (scope, elem, attrs) => {
let lastPos = 0;
appEvents.on(
......
......@@ -14,7 +14,7 @@ const scrollerClass = 'baron__scroller';
export function geminiScrollbar() {
return {
restrict: 'A',
link: function(scope, elem, attrs) {
link: (scope, elem, attrs) => {
let scrollRoot = elem.parent();
const scroller = elem;
......
import React from 'react';
import { shallow } from 'enzyme';
import BottomNavLinks from './BottomNavLinks';
import appEvents from '../../app_events';
jest.mock('../../app_events', () => ({
emit: jest.fn(),
}));
const setup = (propOverrides?: object) => {
const props = Object.assign(
{
link: {},
user: {
isGrafanaAdmin: false,
isSignedIn: false,
orgCount: 2,
orgRole: '',
orgId: 1,
orgName: 'Grafana',
timezone: 'UTC',
helpFlags1: 1,
lightTheme: false,
hasEditPermissionInFolders: false,
},
},
propOverrides
);
return shallow(<BottomNavLinks {...props} />);
};
describe('Render', () => {
it('should render component', () => {
const wrapper = setup();
expect(wrapper).toMatchSnapshot();
});
it('should render organisation switcher', () => {
const wrapper = setup({
link: {
showOrgSwitcher: true,
},
});
expect(wrapper).toMatchSnapshot();
});
it('should render subtitle', () => {
const wrapper = setup({
link: {
subTitle: 'subtitle',
},
});
expect(wrapper).toMatchSnapshot();
});
it('should render children', () => {
const wrapper = setup({
link: {
children: [
{
id: '1',
},
{
id: '2',
},
{
id: '3',
},
{
id: '4',
hideFromMenu: true,
},
],
},
});
expect(wrapper).toMatchSnapshot();
});
});
describe('Functions', () => {
describe('item clicked', () => {
const wrapper = setup();
const mockEvent = { preventDefault: jest.fn() };
it('should emit show modal event if url matches shortcut', () => {
const child = { url: '/shortcuts' };
const instance = wrapper.instance() as BottomNavLinks;
instance.itemClicked(mockEvent, child);
expect(appEvents.emit).toHaveBeenCalledWith('show-modal', { templateHtml: '<help-modal></help-modal>' });
});
});
});
import React, { PureComponent } from 'react';
import appEvents from '../../app_events';
import { User } from '../../services/context_srv';
export interface Props {
link: any;
user: User;
}
class BottomNavLinks extends PureComponent<Props> {
itemClicked = (event, child) => {
if (child.url === '/shortcuts') {
event.preventDefault();
appEvents.emit('show-modal', {
templateHtml: '<help-modal></help-modal>',
});
}
};
switchOrg = () => {
appEvents.emit('show-modal', {
templateHtml: '<org-switcher dismiss="dismiss()"></org-switcher>',
});
};
render() {
const { link, user } = this.props;
return (
<div className="sidemenu-item dropdown dropup">
<a href={link.url} className="sidemenu-link" target={link.target}>
<span className="icon-circle sidemenu-icon">
{link.icon && <i className={link.icon} />}
{link.img && <img src={link.img} />}
</span>
</a>
<ul className="dropdown-menu dropdown-menu--sidemenu" role="menu">
{link.subTitle && (
<li className="sidemenu-subtitle">
<span className="sidemenu-item-text">{link.subTitle}</span>
</li>
)}
{link.showOrgSwitcher && (
<li className="sidemenu-org-switcher">
<a onClick={this.switchOrg}>
<div>
<div className="sidemenu-org-switcher__org-name">{user.orgName}</div>
<div className="sidemenu-org-switcher__org-current">Current Org:</div>
</div>
<div className="sidemenu-org-switcher__switch">
<i className="fa fa-fw fa-random" />Switch
</div>
</a>
</li>
)}
{link.children &&
link.children.map((child, index) => {
if (!child.hideFromMenu) {
return (
<li className={child.divider} key={`${child.text}-${index}`}>
<a href={child.url} target={child.target} onClick={event => this.itemClicked(event, child)}>
{child.icon && <i className={child.icon} />}
{child.text}
</a>
</li>
);
}
return null;
})}
<li className="side-menu-header">
<span className="sidemenu-item-text">{link.text}</span>
</li>
</ul>
</div>
);
}
}
export default BottomNavLinks;
import React from 'react';
import { shallow } from 'enzyme';
import BottomSection from './BottomSection';
jest.mock('../../config', () => ({
bootData: {
navTree: [
{
id: 'profile',
hideFromMenu: true,
},
{
hideFromMenu: true,
},
{
hideFromMenu: false,
},
{
hideFromMenu: true,
},
],
},
user: {
orgCount: 5,
orgName: 'Grafana',
},
}));
jest.mock('app/core/services/context_srv', () => ({
contextSrv: {
sidemenu: true,
isSignedIn: false,
isGrafanaAdmin: false,
hasEditPermissionFolders: false,
},
}));
describe('Render', () => {
it('should render component', () => {
const wrapper = shallow(<BottomSection />);
expect(wrapper).toMatchSnapshot();
});
});
import React from 'react';
import _ from 'lodash';
import SignIn from './SignIn';
import BottomNavLinks from './BottomNavLinks';
import { contextSrv } from 'app/core/services/context_srv';
import config from '../../config';
export default function BottomSection() {
const navTree = _.cloneDeep(config.bootData.navTree);
const bottomNav = _.filter(navTree, item => item.hideFromMenu);
const isSignedIn = contextSrv.isSignedIn;
const user = contextSrv.user;
if (user && user.orgCount > 1) {
const profileNode = _.find(bottomNav, { id: 'profile' });
if (profileNode) {
profileNode.showOrgSwitcher = true;
}
}
return (
<div className="sidemenu__bottom">
{!isSignedIn && <SignIn />}
{bottomNav.map((link, index) => {
return <BottomNavLinks link={link} user={user} key={`${link.url}-${index}`} />;
})}
</div>
);
}
import React from 'react';
import { shallow } from 'enzyme';
import DropDownChild from './DropDownChild';
const setup = (propOverrides?: object) => {
const props = Object.assign(
{
child: {
divider: true,
},
},
propOverrides
);
return shallow(<DropDownChild {...props} />);
};
describe('Render', () => {
it('should render component', () => {
const wrapper = setup();
expect(wrapper).toMatchSnapshot();
});
it('should render icon if exists', () => {
const wrapper = setup({
child: {
divider: false,
icon: 'icon-test',
},
});
expect(wrapper).toMatchSnapshot();
});
});
import React, { SFC } from 'react';
export interface Props {
child: any;
}
const DropDownChild: SFC<Props> = props => {
const { child } = props;
const listItemClassName = child.divider ? 'divider' : '';
return (
<li className={listItemClassName}>
<a href={child.url}>
{child.icon && <i className={child.icon} />}
{child.text}
</a>
</li>
);
};
export default DropDownChild;
import React from 'react';
import { shallow } from 'enzyme';
import { SideMenu } from './SideMenu';
import appEvents from '../../app_events';
import { contextSrv } from 'app/core/services/context_srv';
jest.mock('../../app_events', () => ({
emit: jest.fn(),
}));
jest.mock('app/core/services/context_srv', () => ({
contextSrv: {
sidemenu: true,
user: {},
isSignedIn: false,
isGrafanaAdmin: false,
isEditor: false,
hasEditPermissionFolders: false,
toggleSideMenu: jest.fn(),
},
}));
const setup = (propOverrides?: object) => {
const props = Object.assign(
{
loginUrl: '',
user: {},
mainLinks: [],
bottomeLinks: [],
isSignedIn: false,
},
propOverrides
);
return shallow(<SideMenu {...props} />);
};
describe('Render', () => {
it('should render component', () => {
const wrapper = setup();
expect(wrapper).toMatchSnapshot();
});
});
describe('Functions', () => {
describe('toggle side menu', () => {
const wrapper = setup();
const instance = wrapper.instance() as SideMenu;
instance.toggleSideMenu();
it('should call contextSrv.toggleSideMenu', () => {
expect(contextSrv.toggleSideMenu).toHaveBeenCalled();
});
it('should emit toggle sidemenu event', () => {
expect(appEvents.emit).toHaveBeenCalledWith('toggle-sidemenu');
});
});
describe('toggle side menu on mobile', () => {
const wrapper = setup();
const instance = wrapper.instance() as SideMenu;
instance.toggleSideMenuSmallBreakpoint();
it('should emit toggle sidemenu event', () => {
expect(appEvents.emit).toHaveBeenCalledWith('toggle-sidemenu-mobile');
});
});
});
import React, { PureComponent } from 'react';
import appEvents from '../../app_events';
import { contextSrv } from 'app/core/services/context_srv';
import TopSection from './TopSection';
import BottomSection from './BottomSection';
export class SideMenu extends PureComponent {
toggleSideMenu = () => {
contextSrv.toggleSideMenu();
appEvents.emit('toggle-sidemenu');
};
toggleSideMenuSmallBreakpoint = () => {
appEvents.emit('toggle-sidemenu-mobile');
};
render() {
return [
<div className="sidemenu__logo" onClick={this.toggleSideMenu} key="logo">
<img src="public/img/grafana_icon.svg" alt="graphana_logo" />
</div>,
<div className="sidemenu__logo_small_breakpoint" onClick={this.toggleSideMenuSmallBreakpoint} key="hamburger">
<i className="fa fa-bars" />
<span className="sidemenu__close">
<i className="fa fa-times" />&nbsp;Close
</span>
</div>,
<TopSection key="topsection" />,
<BottomSection key="bottomsection" />,
];
}
}
import React from 'react';
import { shallow } from 'enzyme';
import SideMenuDropDown from './SideMenuDropDown';
const setup = (propOverrides?: object) => {
const props = Object.assign(
{
link: {
text: 'link',
},
},
propOverrides
);
return shallow(<SideMenuDropDown {...props} />);
};
describe('Render', () => {
it('should render component', () => {
const wrapper = setup();
expect(wrapper).toMatchSnapshot();
});
it('should render children', () => {
const wrapper = setup({
link: {
text: 'link',
children: [{ id: 1 }, { id: 2 }, { id: 3 }],
},
});
expect(wrapper).toMatchSnapshot();
});
});
import React, { SFC } from 'react';
import DropDownChild from './DropDownChild';
interface Props {
link: any;
}
const SideMenuDropDown: SFC<Props> = props => {
const { link } = props;
return (
<ul className="dropdown-menu dropdown-menu--sidemenu" role="menu">
<li className="side-menu-header">
<span className="sidemenu-item-text">{link.text}</span>
</li>
{link.children &&
link.children.map((child, index) => {
return <DropDownChild child={child} key={`${child.url}-${index}`} />;
})}
</ul>
);
};
export default SideMenuDropDown;
import React from 'react';
import { shallow } from 'enzyme';
import SignIn from './SignIn';
describe('Render', () => {
it('should render component', () => {
const wrapper = shallow(<SignIn />);
expect(wrapper).toMatchSnapshot();
});
});
import React, { SFC } from 'react';
const SignIn: SFC<any> = () => {
const loginUrl = `login?redirect=${encodeURIComponent(window.location.pathname)}`;
return (
<div className="sidemenu-item">
<a href={loginUrl} className="sidemenu-link" target="_self">
<span className="icon-circle sidemenu-icon">
<i className="fa fa-fw fa-sign-in" />
</span>
</a>
<a href={loginUrl} target="_self">
<ul className="dropdown-menu dropdown-menu--sidemenu" role="menu">
<li className="side-menu-header">
<span className="sidemenu-item-text">Sign In</span>
</li>
</ul>
</a>
</div>
);
};
export default SignIn;
import React from 'react';
import { shallow } from 'enzyme';
import TopSection from './TopSection';
jest.mock('../../config', () => ({
bootData: {
navTree: [
{ id: '1', hideFromMenu: true },
{ id: '2', hideFromMenu: true },
{ id: '3', hideFromMenu: false },
{ id: '4', hideFromMenu: true },
],
},
}));
const setup = (propOverrides?: object) => {
const props = Object.assign(
{
mainLinks: [],
},
propOverrides
);
return shallow(<TopSection {...props} />);
};
describe('Render', () => {
it('should render component', () => {
const wrapper = setup();
expect(wrapper).toMatchSnapshot();
});
it('should render items', () => {
const wrapper = setup({
mainLinks: [{ id: 1 }, { id: 2 }, { id: 3 }, { id: 4 }, { id: 5 }],
});
expect(wrapper).toMatchSnapshot();
});
});
import React, { SFC } from 'react';
import _ from 'lodash';
import TopSectionItem from './TopSectionItem';
import config from '../../config';
const TopSection: SFC<any> = () => {
const navTree = _.cloneDeep(config.bootData.navTree);
const mainLinks = _.filter(navTree, item => !item.hideFromMenu);
return (
<div className="sidemenu__top">
{mainLinks.map((link, index) => {
return <TopSectionItem link={link} key={`${link.id}-${index}`} />;
})}
</div>
);
};
export default TopSection;
import React from 'react';
import { shallow } from 'enzyme';
import TopSectionItem from './TopSectionItem';
const setup = (propOverrides?: object) => {
const props = Object.assign(
{
link: {},
},
propOverrides
);
return shallow(<TopSectionItem {...props} />);
};
describe('Render', () => {
it('should render component', () => {
const wrapper = setup();
expect(wrapper).toMatchSnapshot();
});
});
import React, { SFC } from 'react';
import SideMenuDropDown from './SideMenuDropDown';
export interface Props {
link: any;
}
const TopSectionItem: SFC<Props> = props => {
const { link } = props;
return (
<div className="sidemenu-item dropdown">
<a className="sidemenu-link" href={link.url} target={link.target}>
<span className="icon-circle sidemenu-icon">
<i className={link.icon} />
{link.img && <img src={link.img} />}
</span>
</a>
{link.children && <SideMenuDropDown link={link} />}
</div>
);
};
export default TopSectionItem;
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Render should render children 1`] = `
<div
className="sidemenu-item dropdown dropup"
>
<a
className="sidemenu-link"
>
<span
className="icon-circle sidemenu-icon"
/>
</a>
<ul
className="dropdown-menu dropdown-menu--sidemenu"
role="menu"
>
<li
key="undefined-0"
>
<a
onClick={[Function]}
/>
</li>
<li
key="undefined-1"
>
<a
onClick={[Function]}
/>
</li>
<li
key="undefined-2"
>
<a
onClick={[Function]}
/>
</li>
<li
className="side-menu-header"
>
<span
className="sidemenu-item-text"
/>
</li>
</ul>
</div>
`;
exports[`Render should render component 1`] = `
<div
className="sidemenu-item dropdown dropup"
>
<a
className="sidemenu-link"
>
<span
className="icon-circle sidemenu-icon"
/>
</a>
<ul
className="dropdown-menu dropdown-menu--sidemenu"
role="menu"
>
<li
className="side-menu-header"
>
<span
className="sidemenu-item-text"
/>
</li>
</ul>
</div>
`;
exports[`Render should render organisation switcher 1`] = `
<div
className="sidemenu-item dropdown dropup"
>
<a
className="sidemenu-link"
>
<span
className="icon-circle sidemenu-icon"
/>
</a>
<ul
className="dropdown-menu dropdown-menu--sidemenu"
role="menu"
>
<li
className="sidemenu-org-switcher"
>
<a
onClick={[Function]}
>
<div>
<div
className="sidemenu-org-switcher__org-name"
>
Grafana
</div>
<div
className="sidemenu-org-switcher__org-current"
>
Current Org:
</div>
</div>
<div
className="sidemenu-org-switcher__switch"
>
<i
className="fa fa-fw fa-random"
/>
Switch
</div>
</a>
</li>
<li
className="side-menu-header"
>
<span
className="sidemenu-item-text"
/>
</li>
</ul>
</div>
`;
exports[`Render should render subtitle 1`] = `
<div
className="sidemenu-item dropdown dropup"
>
<a
className="sidemenu-link"
>
<span
className="icon-circle sidemenu-icon"
/>
</a>
<ul
className="dropdown-menu dropdown-menu--sidemenu"
role="menu"
>
<li
className="sidemenu-subtitle"
>
<span
className="sidemenu-item-text"
>
subtitle
</span>
</li>
<li
className="side-menu-header"
>
<span
className="sidemenu-item-text"
/>
</li>
</ul>
</div>
`;
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Render should render component 1`] = `
<div
className="sidemenu__bottom"
>
<SignIn />
<BottomNavLinks
key="undefined-0"
link={
Object {
"hideFromMenu": true,
"id": "profile",
}
}
/>
<BottomNavLinks
key="undefined-1"
link={
Object {
"hideFromMenu": true,
}
}
/>
<BottomNavLinks
key="undefined-2"
link={
Object {
"hideFromMenu": true,
}
}
/>
</div>
`;
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Render should render component 1`] = `
<li
className="divider"
>
<a />
</li>
`;
exports[`Render should render icon if exists 1`] = `
<li
className=""
>
<a>
<i
className="icon-test"
/>
</a>
</li>
`;
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Render should render component 1`] = `
Array [
<div
className="sidemenu__logo"
key="logo"
onClick={[Function]}
/>,
<div
className="sidemenu__logo_small_breakpoint"
key="hamburger"
onClick={[Function]}
/>,
<TopSection
key="topsection"
/>,
<BottomSection
key="bottomsection"
/>,
]
`;
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Render should render children 1`] = `
<ul
className="dropdown-menu dropdown-menu--sidemenu"
role="menu"
>
<li
className="side-menu-header"
>
<span
className="sidemenu-item-text"
>
link
</span>
</li>
<DropDownChild
child={
Object {
"id": 1,
}
}
key="undefined-0"
/>
<DropDownChild
child={
Object {
"id": 2,
}
}
key="undefined-1"
/>
<DropDownChild
child={
Object {
"id": 3,
}
}
key="undefined-2"
/>
</ul>
`;
exports[`Render should render component 1`] = `
<ul
className="dropdown-menu dropdown-menu--sidemenu"
role="menu"
>
<li
className="side-menu-header"
>
<span
className="sidemenu-item-text"
>
link
</span>
</li>
</ul>
`;
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Render should render component 1`] = `
<div
className="sidemenu-item"
>
<a
className="sidemenu-link"
href="login?redirect=blank"
target="_self"
>
<span
className="icon-circle sidemenu-icon"
>
<i
className="fa fa-fw fa-sign-in"
/>
</span>
</a>
<a
href="login?redirect=blank"
target="_self"
>
<ul
className="dropdown-menu dropdown-menu--sidemenu"
role="menu"
>
<li
className="side-menu-header"
>
<span
className="sidemenu-item-text"
>
Sign In
</span>
</li>
</ul>
</a>
</div>
`;
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Render should render component 1`] = `
<div
className="sidemenu__top"
>
<TopSectionItem
key="3-0"
link={
Object {
"hideFromMenu": false,
"id": "3",
}
}
/>
</div>
`;
exports[`Render should render items 1`] = `
<div
className="sidemenu__top"
>
<TopSectionItem
key="3-0"
link={
Object {
"hideFromMenu": false,
"id": "3",
}
}
/>
</div>
`;
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Render should render component 1`] = `
<div
className="sidemenu-item dropdown"
>
<a
className="sidemenu-link"
>
<span
className="icon-circle sidemenu-icon"
>
<i />
</span>
</a>
</div>
`;
<a class="sidemenu__logo" ng-click="ctrl.toggleSideMenu()">
<img src="public/img/grafana_icon.svg"></img>
</a>
<a class="sidemenu__logo_small_breakpoint" ng-click="ctrl.toggleSideMenuSmallBreakpoint()">
<i class="fa fa-bars"></i>
<span class="sidemenu__close">
<i class="fa fa-times"></i>&nbsp;Close</span>
</a>
<div class="sidemenu__top">
<div ng-repeat="item in ::ctrl.mainLinks" class="sidemenu-item dropdown">
<a href="{{::item.url}}" class="sidemenu-link" target="{{::item.target}}">
<span class="icon-circle sidemenu-icon">
<i class="{{::item.icon}}" ng-show="::item.icon"></i>
<img ng-src="{{::item.img}}" ng-show="::item.img">
</span>
</a>
<ul class="dropdown-menu dropdown-menu--sidemenu" role="menu" ng-if="::item.children">
<li class="side-menu-header">
<span class="sidemenu-item-text">{{::item.text}}</span>
</li>
<li ng-repeat="child in ::item.children" ng-class="{divider: child.divider}">
<a href="{{::child.url}}">
<i class="{{::child.icon}}" ng-show="::child.icon"></i>
{{::child.text}}
</a>
</li>
</ul>
</div>
</div>
<div class="sidemenu__bottom">
<div ng-show="::!ctrl.isSignedIn" class="sidemenu-item">
<a href="{{ctrl.loginUrl}}" class="sidemenu-link" target="_self">
<span class="icon-circle sidemenu-icon">
<i class="fa fa-fw fa-sign-in"></i>
</span>
</a>
<a href="{{ctrl.loginUrl}}" target="_self">
<ul class="dropdown-menu dropdown-menu--sidemenu" role="menu">
<li class="side-menu-header">
<span class="sidemenu-item-text">Sign In</span>
</li>
</ul>
</a>
</div>
<div ng-repeat="item in ::ctrl.bottomNav" class="sidemenu-item dropdown dropup">
<a href="{{::item.url}}" class="sidemenu-link" target="{{::item.target}}">
<span class="icon-circle sidemenu-icon">
<i class="{{::item.icon}}" ng-show="::item.icon"></i>
<img ng-src="{{::item.img}}" ng-show="::item.img">
</span>
</a>
<ul class="dropdown-menu dropdown-menu--sidemenu" role="menu">
<li ng-if="item.subTitle" class="sidemenu-subtitle">
<span class="sidemenu-item-text">{{::item.subTitle}}</span>
</li>
<li ng-if="item.showOrgSwitcher" class="sidemenu-org-switcher">
<a ng-click="ctrl.switchOrg()">
<div>
<div class="sidemenu-org-switcher__org-name">{{ctrl.contextSrv.user.orgName}}</div>
<div class="sidemenu-org-switcher__org-current">Current Org:</div>
</div>
<div class="sidemenu-org-switcher__switch">
<i class="fa fa-fw fa-random"></i>Switch</div>
</a>
</li>
<li ng-repeat="child in ::item.children" ng-class="{divider: child.divider}" ng-hide="::child.hideFromMenu">
<a href="{{::child.url}}" target="{{::child.target}}" ng-click="ctrl.itemClicked(child, $event)">
<i class="{{::child.icon}}" ng-show="::child.icon"></i>
{{::child.text}}
</a>
</li>
<li class="side-menu-header">
<span class="sidemenu-item-text">{{::item.text}}</span>
</li>
</ul>
</div>
</div>
\ No newline at end of file
import _ from 'lodash';
import config from 'app/core/config';
import $ from 'jquery';
import coreModule from '../../core_module';
import appEvents from 'app/core/app_events';
export class SideMenuCtrl {
user: any;
mainLinks: any;
bottomNav: any;
loginUrl: string;
isSignedIn: boolean;
isOpenMobile: boolean;
/** @ngInject */
constructor(private $scope, private $rootScope, private $location, private contextSrv, private $timeout) {
this.isSignedIn = contextSrv.isSignedIn;
this.user = contextSrv.user;
const navTree = _.cloneDeep(config.bootData.navTree);
this.mainLinks = _.filter(navTree, item => !item.hideFromMenu);
this.bottomNav = _.filter(navTree, item => item.hideFromMenu);
this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path());
if (contextSrv.user.orgCount > 1) {
const profileNode = _.find(this.bottomNav, { id: 'profile' });
if (profileNode) {
profileNode.showOrgSwitcher = true;
}
}
this.$scope.$on('$routeChangeSuccess', () => {
this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path());
});
}
toggleSideMenu() {
this.contextSrv.toggleSideMenu();
appEvents.emit('toggle-sidemenu');
this.$timeout(() => {
this.$rootScope.$broadcast('render');
});
}
toggleSideMenuSmallBreakpoint() {
appEvents.emit('toggle-sidemenu-mobile');
}
switchOrg() {
this.$rootScope.appEvent('show-modal', {
templateHtml: '<org-switcher dismiss="dismiss()"></org-switcher>',
});
}
itemClicked(item, evt) {
if (item.url === '/shortcuts') {
appEvents.emit('show-modal', {
templateHtml: '<help-modal></help-modal>',
});
evt.preventDefault();
}
}
}
export function sideMenuDirective() {
return {
restrict: 'E',
templateUrl: 'public/app/core/components/sidemenu/sidemenu.html',
controller: SideMenuCtrl,
bindToController: true,
controllerAs: 'ctrl',
scope: {},
link: function(scope, elem) {
// hack to hide dropdown menu
elem.on('click.dropdown', '.dropdown-menu a', function(evt) {
const menu = $(evt.target).parents('.dropdown-menu');
const parent = menu.parent();
menu.detach();
setTimeout(function() {
parent.append(menu);
}, 100);
});
},
};
}
coreModule.directive('sidemenu', sideMenuDirective);
import _ from 'lodash';
export class SqlPartDef {
type: string;
style: string;
label: string;
params: any[];
defaultParams: any[];
wrapOpen: string;
wrapClose: string;
separator: string;
constructor(options: any) {
this.type = options.type;
if (options.label) {
this.label = options.label;
} else {
this.label = this.type[0].toUpperCase() + this.type.substring(1) + ':';
}
this.style = options.style;
if (this.style === 'function') {
this.wrapOpen = '(';
this.wrapClose = ')';
this.separator = ', ';
} else {
this.wrapOpen = ' ';
this.wrapClose = ' ';
this.separator = ' ';
}
this.params = options.params;
this.defaultParams = options.defaultParams;
}
}
export class SqlPart {
part: any;
def: SqlPartDef;
params: any[];
label: string;
name: string;
datatype: string;
constructor(part: any, def: any) {
this.part = part;
this.def = def;
if (!this.def) {
throw { message: 'Could not find sql part ' + part.type };
}
this.datatype = part.datatype;
if (part.name) {
this.name = part.name;
this.label = def.label + ' ' + part.name;
} else {
this.name = '';
this.label = def.label;
}
part.params = part.params || _.clone(this.def.defaultParams);
this.params = part.params;
}
updateParam(strValue, index) {
// handle optional parameters
if (strValue === '' && this.def.params[index].optional) {
this.params.splice(index, 1);
} else {
this.params[index] = strValue;
}
this.part.params = this.params;
}
}
import _ from 'lodash';
import $ from 'jquery';
import coreModule from 'app/core/core_module';
const template = `
<div class="dropdown cascade-open">
<a ng-click="showActionsMenu()" class="query-part-name pointer dropdown-toggle" data-toggle="dropdown">{{part.label}}</a>
<span>{{part.def.wrapOpen}}</span><span class="query-part-parameters"></span><span>{{part.def.wrapClose}}</span>
<ul class="dropdown-menu">
<li ng-repeat="action in partActions">
<a ng-click="triggerPartAction(action)">{{action.text}}</a>
</li>
</ul>
`;
/** @ngInject */
export function sqlPartEditorDirective($compile, templateSrv) {
const paramTemplate = '<input type="text" class="hide input-mini"></input>';
return {
restrict: 'E',
template: template,
scope: {
part: '=',
handleEvent: '&',
debounce: '@',
},
link: function postLink($scope, elem) {
const part = $scope.part;
const partDef = part.def;
const $paramsContainer = elem.find('.query-part-parameters');
const debounceLookup = $scope.debounce;
let cancelBlur = null;
$scope.partActions = [];
function clickFuncParam(this: any, paramIndex) {
/*jshint validthis:true */
const $link = $(this);
const $input = $link.next();
$input.val(part.params[paramIndex]);
$input.css('width', $link.width() + 16 + 'px');
$link.hide();
$input.show();
$input.focus();
$input.select();
const typeahead = $input.data('typeahead');
if (typeahead) {
$input.val('');
typeahead.lookup();
}
}
function inputBlur($input, paramIndex) {
cancelBlur = setTimeout(function() {
switchToLink($input, paramIndex);
}, 200);
}
function switchToLink($input, paramIndex) {
/*jshint validthis:true */
const $link = $input.prev();
const newValue = $input.val();
if (newValue !== '' || part.def.params[paramIndex].optional) {
$link.html(templateSrv.highlightVariablesAsHtml(newValue));
part.updateParam($input.val(), paramIndex);
$scope.$apply(() => {
$scope.handleEvent({ $event: { name: 'part-param-changed' } });
});
}
$input.hide();
$link.show();
}
function inputKeyPress(this: any, paramIndex, e) {
/*jshint validthis:true */
if (e.which === 13) {
switchToLink($(this), paramIndex);
}
}
function inputKeyDown(this: any) {
/*jshint validthis:true */
this.style.width = (3 + this.value.length) * 8 + 'px';
}
function addTypeahead($input, param, paramIndex) {
if (!param.options && !param.dynamicLookup) {
return;
}
const typeaheadSource = function(query, callback) {
if (param.options) {
let options = param.options;
if (param.type === 'int') {
options = _.map(options, function(val) {
return val.toString();
});
}
return options;
}
$scope.$apply(function() {
$scope.handleEvent({ $event: { name: 'get-param-options', param: param } }).then(function(result) {
const dynamicOptions = _.map(result, function(op) {
return op.value;
});
// add current value to dropdown if it's not in dynamicOptions
if (_.indexOf(dynamicOptions, part.params[paramIndex]) === -1) {
dynamicOptions.unshift(part.params[paramIndex]);
}
callback(dynamicOptions);
});
});
};
$input.attr('data-provide', 'typeahead');
$input.typeahead({
source: typeaheadSource,
minLength: 0,
items: 1000,
updater: function(value) {
if (value === part.params[paramIndex]) {
clearTimeout(cancelBlur);
$input.focus();
return value;
}
return value;
},
});
const typeahead = $input.data('typeahead');
typeahead.lookup = function() {
this.query = this.$element.val() || '';
const items = this.source(this.query, $.proxy(this.process, this));
return items ? this.process(items) : items;
};
if (debounceLookup) {
typeahead.lookup = _.debounce(typeahead.lookup, 500, { leading: true });
}
}
$scope.showActionsMenu = function() {
$scope.handleEvent({ $event: { name: 'get-part-actions' } }).then(res => {
$scope.partActions = res;
});
};
$scope.triggerPartAction = function(action) {
$scope.handleEvent({ $event: { name: 'action', action: action } });
};
function addElementsAndCompile() {
_.each(partDef.params, function(param, index) {
if (param.optional && part.params.length <= index) {
return;
}
if (index > 0) {
$('<span>' + partDef.separator + '</span>').appendTo($paramsContainer);
}
const paramValue = templateSrv.highlightVariablesAsHtml(part.params[index]);
const $paramLink = $('<a class="graphite-func-param-link pointer">' + paramValue + '</a>');
const $input = $(paramTemplate);
$paramLink.appendTo($paramsContainer);
$input.appendTo($paramsContainer);
$input.blur(_.partial(inputBlur, $input, index));
$input.keyup(inputKeyDown);
$input.keypress(_.partial(inputKeyPress, index));
$paramLink.click(_.partial(clickFuncParam, index));
addTypeahead($input, param, index);
});
}
function relink() {
$paramsContainer.empty();
addElementsAndCompile();
}
relink();
},
};
}
coreModule.directive('sqlPartEditor', sqlPartEditorDirective);
......@@ -33,9 +33,9 @@ export class Settings {
constructor(options) {
const defaults = {
datasources: {},
window_title_prefix: 'Grafana - ',
windowTitlePrefix: 'Grafana - ',
panels: {},
new_panel_title: 'Panel Title',
newPanelTitle: 'Panel Title',
playlist_timespan: '1m',
unsaved_changes_warning: true,
appSubUrl: '',
......
......@@ -16,8 +16,8 @@ export class InvitedCtrl {
},
};
$scope.init = function() {
backendSrv.get('/api/user/invite/' + $routeParams.code).then(function(invite) {
$scope.init = () => {
backendSrv.get('/api/user/invite/' + $routeParams.code).then(invite => {
$scope.formModel.name = invite.name;
$scope.formModel.email = invite.email;
$scope.formModel.username = invite.email;
......@@ -28,12 +28,12 @@ export class InvitedCtrl {
});
};
$scope.submit = function() {
$scope.submit = () => {
if (!$scope.inviteForm.$valid) {
return;
}
backendSrv.post('/api/user/invite/complete', $scope.formModel).then(function() {
backendSrv.post('/api/user/invite/complete', $scope.formModel).then(() => {
window.location.href = config.appSubUrl + '/';
});
};
......
......@@ -29,7 +29,7 @@ export class LoginCtrl {
$scope.loginMode = true;
$scope.submitBtnText = 'Log in';
$scope.init = function() {
$scope.init = () => {
$scope.$watch('loginMode', $scope.loginModeChanged);
if (config.loginError) {
......@@ -37,7 +37,7 @@ export class LoginCtrl {
}
};
$scope.submit = function() {
$scope.submit = () => {
if ($scope.loginMode) {
$scope.login();
} else {
......@@ -45,7 +45,7 @@ export class LoginCtrl {
}
};
$scope.changeView = function() {
$scope.changeView = () => {
const loginView = document.querySelector('#login-view');
const changePasswordView = document.querySelector('#change-password-view');
......@@ -65,7 +65,7 @@ export class LoginCtrl {
}, 400);
};
$scope.changePassword = function() {
$scope.changePassword = () => {
$scope.command.oldPassword = 'admin';
if ($scope.command.newPassword !== $scope.command.confirmNew) {
......@@ -73,25 +73,25 @@ export class LoginCtrl {
return;
}
backendSrv.put('/api/user/password', $scope.command).then(function() {
backendSrv.put('/api/user/password', $scope.command).then(() => {
$scope.toGrafana();
});
};
$scope.skip = function() {
$scope.skip = () => {
$scope.toGrafana();
};
$scope.loginModeChanged = function(newValue) {
$scope.loginModeChanged = newValue => {
$scope.submitBtnText = newValue ? 'Log in' : 'Sign up';
};
$scope.signUp = function() {
$scope.signUp = () => {
if (!$scope.loginForm.$valid) {
return;
}
backendSrv.post('/api/user/signup', $scope.formModel).then(function(result) {
backendSrv.post('/api/user/signup', $scope.formModel).then(result => {
if (result.status === 'SignUpCreated') {
$location.path('/signup').search({ email: $scope.formModel.email });
} else {
......@@ -100,7 +100,7 @@ export class LoginCtrl {
});
};
$scope.login = function() {
$scope.login = () => {
delete $scope.loginError;
if (!$scope.loginForm.$valid) {
......@@ -110,7 +110,7 @@ export class LoginCtrl {
backendSrv
.post('/login', $scope.formModel)
.then(function(result) {
.then(result => {
$scope.result = result;
if ($scope.formModel.password !== 'admin' || $scope.ldapEnabled || $scope.authProxyEnabled) {
......@@ -125,7 +125,7 @@ export class LoginCtrl {
});
};
$scope.toGrafana = function() {
$scope.toGrafana = () => {
const params = $location.search();
if (params.redirect && params.redirect[0] === '/') {
......
......@@ -22,16 +22,16 @@ export class ResetPasswordCtrl {
},
};
$scope.sendResetEmail = function() {
$scope.sendResetEmail = () => {
if (!$scope.sendResetForm.$valid) {
return;
}
backendSrv.post('/api/user/password/send-reset-email', $scope.formModel).then(function() {
backendSrv.post('/api/user/password/send-reset-email', $scope.formModel).then(() => {
$scope.mode = 'email-sent';
});
};
$scope.submitReset = function() {
$scope.submitReset = () => {
if (!$scope.resetForm.$valid) {
return;
}
......@@ -41,7 +41,7 @@ export class ResetPasswordCtrl {
return;
}
backendSrv.post('/api/user/password/reset', $scope.formModel).then(function() {
backendSrv.post('/api/user/password/reset', $scope.formModel).then(() => {
$location.path('login');
});
};
......
......@@ -20,7 +20,6 @@ import './services/search_srv';
import './services/ng_react';
import { grafanaAppDirective } from './components/grafana_app';
import { sideMenuDirective } from './components/sidemenu/sidemenu';
import { searchDirective } from './components/search/search';
import { infoPopover } from './components/info_popover';
import { navbarDirective } from './components/navbar/navbar';
......@@ -31,6 +30,7 @@ import { layoutSelector } from './components/layout_selector/layout_selector';
import { switchDirective } from './components/switch';
import { dashboardSelector } from './components/dashboard_selector';
import { queryPartEditorDirective } from './components/query_part/query_part_editor';
import { sqlPartEditorDirective } from './components/sql_part/sql_part_editor';
import { formDropdownDirective } from './components/form_dropdown/form_dropdown';
import 'app/core/controllers/all';
import 'app/core/services/all';
......@@ -61,7 +61,6 @@ export {
arrayJoin,
coreModule,
grafanaAppDirective,
sideMenuDirective,
navbarDirective,
searchDirective,
liveSrv,
......@@ -72,6 +71,7 @@ export {
appEvents,
dashboardSelector,
queryPartEditorDirective,
sqlPartEditorDirective,
colors,
formDropdownDirective,
assignModelProperties,
......
......@@ -3,22 +3,22 @@ import angular from 'angular';
import moment from 'moment';
import coreModule from '../core_module';
coreModule.filter('stringSort', function() {
return function(input) {
coreModule.filter('stringSort', () => {
return input => {
return input.sort();
};
});
coreModule.filter('slice', function() {
return function(arr, start, end) {
coreModule.filter('slice', () => {
return (arr, start, end) => {
if (!_.isUndefined(arr)) {
return arr.slice(start, end);
}
};
});
coreModule.filter('stringify', function() {
return function(arr) {
coreModule.filter('stringify', () => {
return arr => {
if (_.isObject(arr) && !_.isArray(arr)) {
return angular.toJson(arr);
} else {
......@@ -27,8 +27,8 @@ coreModule.filter('stringify', function() {
};
});
coreModule.filter('moment', function() {
return function(date, mode) {
coreModule.filter('moment', () => {
return (date, mode) => {
switch (mode) {
case 'ago':
return moment(date).fromNow();
......@@ -37,8 +37,8 @@ coreModule.filter('moment', function() {
};
});
coreModule.filter('noXml', function() {
const noXml = function(text) {
coreModule.filter('noXml', () => {
const noXml = text => {
return _.isString(text)
? text
.replace(/&/g, '&amp;')
......@@ -48,14 +48,14 @@ coreModule.filter('noXml', function() {
.replace(/"/g, '&quot;')
: text;
};
return function(text) {
return text => {
return _.isArray(text) ? _.map(text, noXml) : noXml(text);
};
});
/** @ngInject */
function interpolateTemplateVars(templateSrv) {
const filterFunc: any = function(text, scope) {
const filterFunc: any = (text, scope) => {
let scopedVars;
if (scope.ctrl) {
scopedVars = (scope.ctrl.panel || scope.ctrl.row).scopedVars;
......
......@@ -4,7 +4,7 @@ import _ from 'lodash';
Mixins :)
*/
_.mixin({
move: function(array, fromIndex, toIndex) {
move: (array, fromIndex, toIndex) => {
array.splice(toIndex, 0, array.splice(fromIndex, 1)[0]);
return array;
},
......
......@@ -70,7 +70,7 @@ export class AlertSrv {
const newAlertJson = angular.toJson(newAlert);
// remove same alert if it already exists
_.remove(this.list, function(value) {
_.remove(this.list, value => {
return angular.toJson(value) === newAlertJson;
});
......
......@@ -8,6 +8,8 @@ export class User {
isSignedIn: any;
orgRole: any;
orgId: number;
orgName: string;
orgCount: number;
timezone: string;
helpFlags1: number;
lightTheme: boolean;
......
......@@ -6,13 +6,13 @@ import Drop from 'tether-drop';
function popoverSrv(this: any, $compile, $rootScope, $timeout) {
let openDrop = null;
this.close = function() {
this.close = () => {
if (openDrop) {
openDrop.close();
}
};
this.show = function(options) {
this.show = options => {
if (openDrop) {
openDrop.close();
openDrop = null;
......@@ -68,7 +68,7 @@ function popoverSrv(this: any, $compile, $rootScope, $timeout) {
}, 100);
// return close function
return function() {
return () => {
if (drop) {
drop.close();
}
......
......@@ -42,48 +42,48 @@ export function uiSegmentSrv(this: any, $sce, templateSrv) {
}
};
this.newSelectMeasurement = function() {
this.newSelectMeasurement = () => {
return new MetricSegment({ value: 'select measurement', fake: true });
};
this.newFake = function(text, type, cssClass) {
this.newFake = (text, type, cssClass) => {
return new MetricSegment({ value: text, fake: true, type: type, cssClass: cssClass });
};
this.newSegment = function(options) {
this.newSegment = options => {
return new MetricSegment(options);
};
this.newKey = function(key) {
this.newKey = key => {
return new MetricSegment({ value: key, type: 'key', cssClass: 'query-segment-key' });
};
this.newKeyValue = function(value) {
this.newKeyValue = value => {
return new MetricSegment({ value: value, type: 'value', cssClass: 'query-segment-value' });
};
this.newCondition = function(condition) {
this.newCondition = condition => {
return new MetricSegment({ value: condition, type: 'condition', cssClass: 'query-keyword' });
};
this.newOperator = function(op) {
this.newOperator = op => {
return new MetricSegment({ value: op, type: 'operator', cssClass: 'query-segment-operator' });
};
this.newOperators = function(ops) {
return _.map(ops, function(op) {
this.newOperators = ops => {
return _.map(ops, op => {
return new MetricSegment({ value: op, type: 'operator', cssClass: 'query-segment-operator' });
});
};
this.transformToSegments = function(addTemplateVars, variableTypeFilter) {
return function(results) {
const segments = _.map(results, function(segment) {
this.transformToSegments = (addTemplateVars, variableTypeFilter) => {
return results => {
const segments = _.map(results, segment => {
return self.newSegment({ value: segment.text, expandable: segment.expandable });
});
if (addTemplateVars) {
_.each(templateSrv.variables, function(variable) {
_.each(templateSrv.variables, variable => {
if (variableTypeFilter === void 0 || variableTypeFilter === variable.type) {
segments.unshift(self.newSegment({ type: 'value', value: '$' + variable.name, expandable: true }));
}
......@@ -94,11 +94,11 @@ export function uiSegmentSrv(this: any, $sce, templateSrv) {
};
};
this.newSelectMetric = function() {
this.newSelectMetric = () => {
return new MetricSegment({ value: 'select metric', fake: true });
};
this.newPlusButton = function() {
this.newPlusButton = () => {
return new MetricSegment({
fake: true,
html: '<i class="fa fa-plus "></i>',
......
......@@ -44,7 +44,7 @@ export class UtilSrv {
backdrop: options.backdrop,
});
Promise.resolve(modal).then(function(modalEl) {
Promise.resolve(modal).then(modalEl => {
modalEl.modal('show');
});
}
......@@ -52,12 +52,12 @@ export class UtilSrv {
showConfirmModal(payload) {
const scope = this.$rootScope.$new();
scope.onConfirm = function() {
scope.onConfirm = () => {
payload.onConfirm();
scope.dismiss();
};
scope.updateConfirmText = function(value) {
scope.updateConfirmText = value => {
scope.confirmTextValid = payload.confirmText.toLowerCase() === value.toLowerCase();
};
......
import { BackendSrv } from 'app/core/services/backend_srv';
jest.mock('app/core/store');
describe('backend_srv', function() {
describe('backend_srv', () => {
const _httpBackend = options => {
if (options.url === 'gateway-error') {
return Promise.reject({ status: 502 });
......
......@@ -91,11 +91,11 @@ describe('DateMath', () => {
});
_.each(spans, span => {
it('should round now to the beginning of the ' + span, function() {
it('should round now to the beginning of the ' + span, () => {
expect(dateMath.parse('now/' + span).format(format)).toEqual(now.startOf(span).format(format));
});
it('should round now to the end of the ' + span, function() {
it('should round now to the end of the ' + span, () => {
expect(dateMath.parse('now/' + span, true).format(format)).toEqual(now.endOf(span).format(format));
});
});
......@@ -114,18 +114,18 @@ describe('DateMath', () => {
});
});
describe('relative time to date parsing', function() {
it('should handle negative time', function() {
describe('relative time to date parsing', () => {
it('should handle negative time', () => {
const date = dateMath.parseDateMath('-2d', moment([2014, 1, 5]));
expect(date.valueOf()).toEqual(moment([2014, 1, 3]).valueOf());
});
it('should handle multiple math expressions', function() {
it('should handle multiple math expressions', () => {
const date = dateMath.parseDateMath('-2d-6h', moment([2014, 1, 5]));
expect(date.valueOf()).toEqual(moment([2014, 1, 2, 18]).valueOf());
});
it('should return false when invalid expression', function() {
it('should return false when invalid expression', () => {
const date = dateMath.parseDateMath('2', moment([2014, 1, 5]));
expect(date).toEqual(undefined);
});
......
......@@ -101,7 +101,7 @@ describe('file_export', () => {
expect(returnedText).toBe(expectedText);
});
it('should decode HTML encoded characters', function() {
it('should decode HTML encoded characters', () => {
const inputTable = {
columns: [{ text: 'string_value' }],
rows: [
......
......@@ -9,8 +9,8 @@ for (let i = 0; i < links.length; i++) {
}
const isWebkit = !!window.navigator.userAgent.match(/AppleWebKit\/([^ ;]*)/);
const webkitLoadCheck = function(link, callback) {
setTimeout(function() {
const webkitLoadCheck = (link, callback) => {
setTimeout(() => {
for (let i = 0; i < document.styleSheets.length; i++) {
const sheet = document.styleSheets[i];
if (sheet.href === link.href) {
......@@ -21,19 +21,19 @@ const webkitLoadCheck = function(link, callback) {
}, 10);
};
const noop = function() {};
const noop = () => {};
const loadCSS = function(url) {
return new Promise(function(resolve, reject) {
const loadCSS = url => {
return new Promise((resolve, reject) => {
const link = document.createElement('link');
const timeout = setTimeout(function() {
const timeout = setTimeout(() => {
reject('Unable to load CSS');
}, waitSeconds * 1000);
const _callback = function(error) {
const _callback = error => {
clearTimeout(timeout);
link.onload = link.onerror = noop;
setTimeout(function() {
setTimeout(() => {
if (error) {
reject(error);
} else {
......@@ -47,14 +47,14 @@ const loadCSS = function(url) {
link.href = url;
if (!isWebkit) {
link.onload = function() {
link.onload = () => {
_callback(undefined);
};
} else {
webkitLoadCheck(link, _callback);
}
link.onerror = function(evt: any) {
link.onerror = (evt: any) => {
_callback(evt.error || new Error('Error loading CSS file.'));
};
......
......@@ -450,6 +450,7 @@ kbn.valueFormats.currencySEK = kbn.formatBuilders.currency('kr');
kbn.valueFormats.currencyCZK = kbn.formatBuilders.currency('czk');
kbn.valueFormats.currencyCHF = kbn.formatBuilders.currency('CHF');
kbn.valueFormats.currencyPLN = kbn.formatBuilders.currency('zł');
kbn.valueFormats.currencyBTC = kbn.formatBuilders.currency('฿');
// Data (Binary)
kbn.valueFormats.bits = kbn.formatBuilders.binarySIPrefix('b');
......@@ -882,6 +883,7 @@ kbn.getUnitFormats = function() {
{ text: 'Czech koruna (czk)', value: 'currencyCZK' },
{ text: 'Swiss franc (CHF)', value: 'currencyCHF' },
{ text: 'Polish Złoty (PLN)', value: 'currencyPLN' },
{ text: 'Bitcoin (฿)', value: 'currencyBTC' },
],
},
{
......
......@@ -128,7 +128,7 @@ export class ChangeTracker {
});
// ignore template variable values
_.each(dash.templating.list, function(value) {
_.each(dash.templating.list, value => {
value.current = null;
value.options = null;
value.filters = null;
......
......@@ -59,7 +59,7 @@ export class DashboardLoaderSrv {
});
}
promise.then(function(result) {
promise.then(result => {
if (result.meta.dashboardNotFound !== true) {
impressionSrv.addDashboardImpression(result.dashboard.id);
}
......
......@@ -15,7 +15,7 @@ function dashRepeatOptionDirective(variableSrv) {
scope: {
panel: '=',
},
link: function(scope, element) {
link: (scope, element) => {
element.css({ display: 'block', width: '100%' });
scope.variables = variableSrv.variables.map(item => {
......@@ -36,7 +36,7 @@ function dashRepeatOptionDirective(variableSrv) {
scope.panel.repeatDirection = 'h';
}
scope.optionChanged = function() {
scope.optionChanged = () => {
if (scope.panel.repeat) {
scope.panel.repeatDirection = 'h';
}
......
......@@ -11,7 +11,7 @@ export function ShareModalCtrl($scope, $rootScope, $location, $timeout, timeSrv,
};
$scope.editor = { index: $scope.tabIndex || 0 };
$scope.init = function() {
$scope.init = () => {
$scope.modeSharePanel = $scope.panel ? true : false;
$scope.tabs = [{ title: 'Link', src: 'shareLink.html' }];
......@@ -34,7 +34,7 @@ export function ShareModalCtrl($scope, $rootScope, $location, $timeout, timeSrv,
$scope.buildUrl();
};
$scope.buildUrl = function() {
$scope.buildUrl = () => {
let baseUrl = $location.absUrl();
const queryStart = baseUrl.indexOf('?');
......@@ -90,7 +90,7 @@ export function ShareModalCtrl($scope, $rootScope, $location, $timeout, timeSrv,
// This function will try to return the proper full name of the local timezone
// Chrome does not handle the timezone offset (but phantomjs does)
$scope.getLocalTimeZone = function() {
$scope.getLocalTimeZone = () => {
const utcOffset = '&tz=UTC' + encodeURIComponent(moment().format('Z'));
// Older browser does not the internationalization API
......@@ -111,7 +111,7 @@ export function ShareModalCtrl($scope, $rootScope, $location, $timeout, timeSrv,
return '&tz=' + encodeURIComponent(options.timeZone);
};
$scope.getShareUrl = function() {
$scope.getShareUrl = () => {
return $scope.shareUrl;
};
}
......
......@@ -25,8 +25,8 @@ export class ShareSnapshotCtrl {
{ text: 'Public on the web', value: 3 },
];
$scope.init = function() {
backendSrv.get('/api/snapshot/shared-options').then(function(options) {
$scope.init = () => {
backendSrv.get('/api/snapshot/shared-options').then(options => {
$scope.externalUrl = options['externalSnapshotURL'];
$scope.sharingButtonText = options['externalSnapshotName'];
$scope.externalEnabled = options['externalEnabled'];
......@@ -35,7 +35,7 @@ export class ShareSnapshotCtrl {
$scope.apiUrl = '/api/snapshots';
$scope.createSnapshot = function(external) {
$scope.createSnapshot = external => {
$scope.dashboard.snapshot = {
timestamp: new Date(),
};
......@@ -49,12 +49,12 @@ export class ShareSnapshotCtrl {
$rootScope.$broadcast('refresh');
$timeout(function() {
$timeout(() => {
$scope.saveSnapshot(external);
}, $scope.snapshot.timeoutSeconds * 1000);
};
$scope.saveSnapshot = function(external) {
$scope.saveSnapshot = external => {
const dash = $scope.dashboard.getSaveModelClone();
$scope.scrubDashboard(dash);
......@@ -67,7 +67,7 @@ export class ShareSnapshotCtrl {
const postUrl = external ? $scope.externalUrl + $scope.apiUrl : $scope.apiUrl;
backendSrv.post(postUrl, cmdData).then(
function(results) {
results => {
$scope.loading = false;
if (external) {
......@@ -88,17 +88,17 @@ export class ShareSnapshotCtrl {
$scope.step = 2;
},
function() {
() => {
$scope.loading = false;
}
);
};
$scope.getSnapshotUrl = function() {
$scope.getSnapshotUrl = () => {
return $scope.snapshotUrl;
};
$scope.scrubDashboard = function(dash) {
$scope.scrubDashboard = dash => {
// change title
dash.title = $scope.snapshot.name;
......@@ -106,7 +106,7 @@ export class ShareSnapshotCtrl {
dash.time = timeSrv.timeRange();
// remove panel queries & links
_.each(dash.panels, function(panel) {
_.each(dash.panels, panel => {
panel.targets = [];
panel.links = [];
panel.datasource = null;
......@@ -114,10 +114,10 @@ export class ShareSnapshotCtrl {
// remove annotation queries
dash.annotations.list = _.chain(dash.annotations.list)
.filter(function(annotation) {
.filter(annotation => {
return annotation.enable;
})
.map(function(annotation) {
.map(annotation => {
return {
name: annotation.name,
enable: annotation.enable,
......@@ -131,7 +131,7 @@ export class ShareSnapshotCtrl {
.value();
// remove template queries
_.each(dash.templating.list, function(variable) {
_.each(dash.templating.list, variable => {
variable.query = '';
variable.options = variable.current;
variable.refresh = false;
......@@ -149,21 +149,21 @@ export class ShareSnapshotCtrl {
// cleanup snapshotData
delete $scope.dashboard.snapshot;
$scope.dashboard.forEachPanel(function(panel) {
$scope.dashboard.forEachPanel(panel => {
delete panel.snapshotData;
});
_.each($scope.dashboard.annotations.list, function(annotation) {
_.each($scope.dashboard.annotations.list, annotation => {
delete annotation.snapshotData;
});
};
$scope.deleteSnapshot = function() {
backendSrv.get($scope.deleteUrl).then(function() {
$scope.deleteSnapshot = () => {
backendSrv.get($scope.deleteUrl).then(() => {
$scope.step = 3;
});
};
$scope.saveExternalSnapshotRef = function(cmdData, results) {
$scope.saveExternalSnapshotRef = (cmdData, results) => {
// save external in local instance as well
cmdData.external = true;
cmdData.key = results.key;
......
......@@ -5,10 +5,10 @@ export function inputDateDirective() {
return {
restrict: 'A',
require: 'ngModel',
link: function($scope, $elem, attrs, ngModel) {
link: ($scope, $elem, attrs, ngModel) => {
const format = 'YYYY-MM-DD HH:mm:ss';
const fromUser = function(text) {
const fromUser = text => {
if (text.indexOf('now') !== -1) {
if (!dateMath.isValid(text)) {
ngModel.$setValidity('error', false);
......@@ -34,7 +34,7 @@ export function inputDateDirective() {
return parsed;
};
const toUser = function(currentValue) {
const toUser = currentValue => {
if (moment.isMoment(currentValue)) {
return currentValue.format(format);
} else {
......
......@@ -16,11 +16,11 @@ function uploadDashboardDirective(timer, alertSrv, $location) {
scope: {
onUpload: '&',
},
link: function(scope) {
link: scope => {
function file_selected(evt) {
const files = evt.target.files; // FileList object
const readerOnload = function() {
return function(e) {
const readerOnload = () => {
return e => {
let dash;
try {
dash = JSON.parse(e.target.result);
......@@ -30,7 +30,7 @@ function uploadDashboardDirective(timer, alertSrv, $location) {
return;
}
scope.$apply(function() {
scope.$apply(() => {
scope.onUpload({ dash: dash });
});
};
......
......@@ -22,18 +22,18 @@ export class DashboardViewState {
self.$scope = $scope;
self.dashboard = $scope.dashboard;
$scope.onAppEvent('$routeUpdate', function() {
$scope.onAppEvent('$routeUpdate', () => {
const urlState = self.getQueryStringState();
if (self.needsSync(urlState)) {
self.update(urlState, true);
}
});
$scope.onAppEvent('panel-change-view', function(evt, payload) {
$scope.onAppEvent('panel-change-view', (evt, payload) => {
self.update(payload);
});
$scope.onAppEvent('panel-initialized', function(evt, payload) {
$scope.onAppEvent('panel-initialized', (evt, payload) => {
self.registerPanel(payload.scope);
});
......@@ -156,7 +156,7 @@ export class DashboardViewState {
}
getPanelScope(id) {
return _.find(this.panelScopes, function(panelScope) {
return _.find(this.panelScopes, panelScope => {
return panelScope.ctrl.panel.id === id;
});
}
......@@ -176,7 +176,7 @@ export class DashboardViewState {
return false;
}
this.$timeout(function() {
this.$timeout(() => {
if (self.oldTimeRange !== ctrl.range) {
self.$rootScope.$broadcast('refresh');
} else {
......@@ -216,7 +216,7 @@ export class DashboardViewState {
}
}
const unbind = panelScope.$on('$destroy', function() {
const unbind = panelScope.$on('$destroy', () => {
self.panelScopes = _.without(self.panelScopes, panelScope);
unbind();
});
......@@ -226,7 +226,7 @@ export class DashboardViewState {
/** @ngInject */
export function dashboardViewStateSrv($location, $timeout, $rootScope) {
return {
create: function($scope) {
create: $scope => {
return new DashboardViewState($scope, $location, $timeout, $rootScope);
},
};
......
......@@ -10,7 +10,7 @@ function dashLinksContainer() {
restrict: 'E',
controller: 'DashLinksContainerCtrl',
template: '<dash-link ng-repeat="link in generatedLinks" link="link"></dash-link>',
link: function() {},
link: () => {},
};
}
......@@ -18,7 +18,7 @@ function dashLinksContainer() {
function dashLink($compile, $sanitize, linkSrv) {
return {
restrict: 'E',
link: function(scope, elem) {
link: (scope, elem) => {
const link = scope.link;
let template =
'<div class="gf-form">' +
......@@ -130,16 +130,16 @@ export class DashLinksContainerCtrl {
function updateDashLinks() {
const promises = _.map($scope.links, buildLinks);
$q.all(promises).then(function(results) {
$q.all(promises).then(results => {
$scope.generatedLinks = _.flatten(results);
});
}
$scope.searchDashboards = function(link, limit) {
return backendSrv.search({ tag: link.tags, limit: limit }).then(function(results) {
$scope.searchDashboards = (link, limit) => {
return backendSrv.search({ tag: link.tags, limit: limit }).then(results => {
return _.reduce(
results,
function(memo, dash) {
(memo, dash) => {
// do not add current dashboard
if (dash.id !== currentDashId) {
memo.push({
......@@ -158,9 +158,9 @@ export class DashLinksContainerCtrl {
});
};
$scope.fillDropdown = function(link) {
$scope.searchDashboards(link, 100).then(function(results) {
_.each(results, function(hit) {
$scope.fillDropdown = link => {
$scope.searchDashboards(link, 100).then(results => {
_.each(results, hit => {
hit.url = linkSrv.getLinkUrl(hit);
});
link.searchHits = results;
......
......@@ -9,7 +9,7 @@ export class ChangePasswordCtrl {
$scope.ldapEnabled = config.ldapEnabled;
$scope.navModel = navModelSrv.getNav('profile', 'change-password', 0);
$scope.changePassword = function() {
$scope.changePassword = () => {
if (!$scope.userForm.$valid) {
return;
}
......@@ -19,7 +19,7 @@ export class ChangePasswordCtrl {
return;
}
backendSrv.put('/api/user/password', $scope.command).then(function() {
backendSrv.put('/api/user/password', $scope.command).then(() => {
$location.path('profile');
});
};
......
......@@ -7,9 +7,9 @@ export class NewOrgCtrl {
$scope.navModel = navModelSrv.getNav('cfg', 'admin', 'global-orgs', 1);
$scope.newOrg = { name: '' };
$scope.createOrg = function() {
backendSrv.post('/api/orgs/', $scope.newOrg).then(function(result) {
backendSrv.post('/api/user/using/' + result.orgId).then(function() {
$scope.createOrg = () => {
backendSrv.post('/api/orgs/', $scope.newOrg).then(result => {
backendSrv.post('/api/user/using/' + result.orgId).then(() => {
window.location.href = config.appSubUrl + '/org';
});
});
......
......@@ -8,22 +8,22 @@ export class OrgApiKeysCtrl {
$scope.roleTypes = ['Viewer', 'Editor', 'Admin'];
$scope.token = { role: 'Viewer' };
$scope.init = function() {
$scope.init = () => {
$scope.getTokens();
};
$scope.getTokens = function() {
backendSrv.get('/api/auth/keys').then(function(tokens) {
$scope.getTokens = () => {
backendSrv.get('/api/auth/keys').then(tokens => {
$scope.tokens = tokens;
});
};
$scope.removeToken = function(id) {
$scope.removeToken = id => {
backendSrv.delete('/api/auth/keys/' + id).then($scope.getTokens);
};
$scope.addToken = function() {
backendSrv.post('/api/auth/keys', $scope.token).then(function(result) {
$scope.addToken = () => {
backendSrv.post('/api/auth/keys', $scope.token).then(result => {
const modalScope = $scope.$new(true);
modalScope.key = result.key;
modalScope.rootPath = window.location.origin + $scope.$root.appSubUrl;
......
......@@ -14,18 +14,18 @@ export class SelectOrgCtrl {
},
};
$scope.init = function() {
$scope.init = () => {
$scope.getUserOrgs();
};
$scope.getUserOrgs = function() {
backendSrv.get('/api/user/orgs').then(function(orgs) {
$scope.getUserOrgs = () => {
backendSrv.get('/api/user/orgs').then(orgs => {
$scope.orgs = orgs;
});
};
$scope.setUsingOrg = function(org) {
backendSrv.post('/api/user/using/' + org.orgId).then(function() {
$scope.setUsingOrg = org => {
backendSrv.post('/api/user/using/' + org.orgId).then(() => {
window.location.href = config.appSubUrl + '/';
});
};
......
......@@ -54,13 +54,13 @@ const panelTemplate = `
</div>
`;
module.directive('grafanaPanel', function($rootScope, $document, $timeout) {
module.directive('grafanaPanel', ($rootScope, $document, $timeout) => {
return {
restrict: 'E',
template: panelTemplate,
transclude: true,
scope: { ctrl: '=' },
link: function(scope, elem) {
link: (scope, elem) => {
const panelContainer = elem.find('.panel-container');
const panelContent = elem.find('.panel-content');
const cornerInfoElem = elem.find('.panel-info-corner');
......@@ -184,7 +184,7 @@ module.directive('grafanaPanel', function($rootScope, $document, $timeout) {
infoDrop = new Drop({
target: cornerInfoElem[0],
content: function() {
content: () => {
return ctrl.getInfoContent({ mode: 'tooltip' });
},
classes: ctrl.error ? 'drop-error' : 'drop-help',
......@@ -208,7 +208,7 @@ module.directive('grafanaPanel', function($rootScope, $document, $timeout) {
scope.$watchGroup(['ctrl.error', 'ctrl.panel.description'], updatePanelCornerInfo);
scope.$watchCollection('ctrl.panel.links', updatePanelCornerInfo);
cornerInfoElem.on('click', function() {
cornerInfoElem.on('click', () => {
infoDrop.close();
scope.$apply(ctrl.openInspector.bind(ctrl));
});
......@@ -216,7 +216,7 @@ module.directive('grafanaPanel', function($rootScope, $document, $timeout) {
elem.on('mouseenter', mouseEnter);
elem.on('mouseleave', mouseLeave);
scope.$on('$destroy', function() {
scope.$on('$destroy', () => {
elem.off();
cornerInfoElem.off();
......@@ -232,7 +232,7 @@ module.directive('grafanaPanel', function($rootScope, $document, $timeout) {
};
});
module.directive('panelHelpCorner', function($rootScope) {
module.directive('panelHelpCorner', $rootScope => {
return {
restrict: 'E',
template: `
......@@ -242,6 +242,6 @@ module.directive('panelHelpCorner', function($rootScope) {
</span>
</span>
`,
link: function(scope, elem) {},
link: (scope, elem) => {},
};
});
......@@ -85,12 +85,12 @@ function panelHeader($compile) {
return {
restrict: 'E',
template: template,
link: function(scope, elem, attrs) {
link: (scope, elem, attrs) => {
const menuElem = elem.find('.panel-menu');
let menuScope;
let isDragged;
elem.click(function(evt) {
elem.click(evt => {
const targetClass = evt.target.className;
// remove existing scope
......
......@@ -170,8 +170,8 @@ export function queryTroubleshooter() {
panelCtrl: '=',
isOpen: '=',
},
link: function(scope, elem, attrs, ctrl) {
ctrl.renderJsonExplorer = function(data) {
link: (scope, elem, attrs, ctrl) => {
ctrl.renderJsonExplorer = data => {
const jsonElem = elem.find('.query-troubleshooter-json');
ctrl.jsonExplorer = new JsonExplorer(data, 3, {
......
......@@ -7,7 +7,7 @@ export class SoloPanelCtrl {
constructor($scope, $routeParams, $location, dashboardLoaderSrv, contextSrv, backendSrv) {
let panelId;
$scope.init = function() {
$scope.init = () => {
contextSrv.sidemenu = false;
appEvents.emit('toggle-sidemenu-hidden');
......@@ -27,13 +27,13 @@ export class SoloPanelCtrl {
return;
}
dashboardLoaderSrv.loadDashboard($routeParams.type, $routeParams.slug, $routeParams.uid).then(function(result) {
dashboardLoaderSrv.loadDashboard($routeParams.type, $routeParams.slug, $routeParams.uid).then(result => {
result.meta.soloMode = true;
$scope.initDashboard(result, $scope);
});
};
$scope.initPanelScope = function() {
$scope.initPanelScope = () => {
const panelInfo = $scope.dashboard.getPanelInfoById(panelId);
// fake row ctrl scope
......
......@@ -10,7 +10,7 @@ function panelLinksEditor() {
restrict: 'E',
controller: 'PanelLinksEditorCtrl',
templateUrl: 'public/app/features/panellinks/module.html',
link: function() {},
link: () => {},
};
}
......@@ -19,15 +19,15 @@ export class PanelLinksEditorCtrl {
constructor($scope, backendSrv) {
$scope.panel.links = $scope.panel.links || [];
$scope.addLink = function() {
$scope.addLink = () => {
$scope.panel.links.push({
type: 'dashboard',
});
};
$scope.searchDashboards = function(queryStr, callback) {
backendSrv.search({ query: queryStr }).then(function(hits) {
const dashboards = _.map(hits, function(dash) {
$scope.searchDashboards = (queryStr, callback) => {
backendSrv.search({ query: queryStr }).then(hits => {
const dashboards = _.map(hits, dash => {
return dash.title;
});
......@@ -35,8 +35,8 @@ export class PanelLinksEditorCtrl {
});
};
$scope.dashboardChanged = function(link) {
backendSrv.search({ query: link.dashboard }).then(function(hits) {
$scope.dashboardChanged = link => {
backendSrv.search({ query: link.dashboard }).then(hits => {
const dashboard = _.find(hits, { title: link.dashboard });
if (dashboard) {
if (dashboard.url) {
......@@ -50,7 +50,7 @@ export class PanelLinksEditorCtrl {
});
};
$scope.deleteLink = function(link) {
$scope.deleteLink = link => {
$scope.panel.links = _.without($scope.panel.links, link);
};
}
......
......@@ -21,7 +21,7 @@ function grafanaRoutes($routeProvider) {
.when('/playlists/play/:id', {
template: '',
resolve: {
init: function(playlistSrv, $route) {
init: (playlistSrv, $route) => {
const playlistId = $route.current.params.id;
playlistSrv.start(playlistId);
},
......
......@@ -200,7 +200,7 @@ export class DataSourceEditCtrl {
coreModule.controller('DataSourceEditCtrl', DataSourceEditCtrl);
coreModule.directive('datasourceHttpSettings', function() {
coreModule.directive('datasourceHttpSettings', () => {
return {
scope: {
current: '=',
......@@ -209,15 +209,15 @@ coreModule.directive('datasourceHttpSettings', function() {
},
templateUrl: 'public/app/features/plugins/partials/ds_http_settings.html',
link: {
pre: function($scope, elem, attrs) {
pre: ($scope, elem, attrs) => {
// do not show access option if direct access is disabled
$scope.showAccessOption = $scope.noDirectAccess !== 'true';
$scope.showAccessHelp = false;
$scope.toggleAccessHelp = function() {
$scope.toggleAccessHelp = () => {
$scope.showAccessHelp = !$scope.showAccessHelp;
};
$scope.getSuggestUrls = function() {
$scope.getSuggestUrls = () => {
return [$scope.suggestUrl];
};
},
......
......@@ -36,7 +36,7 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
// handle relative template urls for plugin templates
options.Component.templateUrl = relativeTemplateUrlToAbs(options.Component.templateUrl, options.baseUrl);
return function() {
return () => {
return {
templateUrl: options.Component.templateUrl,
template: options.Component.template,
......@@ -71,12 +71,12 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
const panelInfo = config.panels[scope.panel.type];
let panelCtrlPromise = Promise.resolve(UnknownPanelCtrl);
if (panelInfo) {
panelCtrlPromise = importPluginModule(panelInfo.module).then(function(panelModule) {
panelCtrlPromise = importPluginModule(panelInfo.module).then(panelModule => {
return panelModule.PanelCtrl;
});
}
return panelCtrlPromise.then(function(PanelCtrl: any) {
return panelCtrlPromise.then((PanelCtrl: any) => {
componentInfo.Component = PanelCtrl;
if (!PanelCtrl || PanelCtrl.registered) {
......@@ -128,7 +128,7 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
}
// Annotations
case 'annotations-query-ctrl': {
return importPluginModule(scope.ctrl.currentDatasource.meta.module).then(function(dsModule) {
return importPluginModule(scope.ctrl.currentDatasource.meta.module).then(dsModule => {
return {
baseUrl: scope.ctrl.currentDatasource.meta.baseUrl,
name: 'annotations-query-ctrl-' + scope.ctrl.currentDatasource.meta.id,
......@@ -144,7 +144,7 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
// Datasource ConfigCtrl
case 'datasource-config-ctrl': {
const dsMeta = scope.ctrl.datasourceMeta;
return importPluginModule(dsMeta.module).then(function(dsModule): any {
return importPluginModule(dsMeta.module).then((dsModule): any => {
if (!dsModule.ConfigCtrl) {
return { notFound: true };
}
......@@ -161,7 +161,7 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
// AppConfigCtrl
case 'app-config-ctrl': {
const model = scope.ctrl.model;
return importPluginModule(model.module).then(function(appModule) {
return importPluginModule(model.module).then(appModule => {
return {
baseUrl: model.baseUrl,
name: 'app-config-' + model.id,
......@@ -174,7 +174,7 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
// App Page
case 'app-page': {
const appModel = scope.ctrl.appModel;
return importPluginModule(appModel.module).then(function(appModule) {
return importPluginModule(appModel.module).then(appModule => {
return {
baseUrl: appModel.baseUrl,
name: 'app-page-' + appModel.id + '-' + scope.ctrl.page.slug,
......@@ -206,9 +206,9 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
elem.empty();
// let a binding digest cycle complete before adding to dom
setTimeout(function() {
setTimeout(() => {
elem.append(child);
scope.$applyAsync(function() {
scope.$applyAsync(() => {
scope.$broadcast('component-did-mount');
scope.$broadcast('refresh');
});
......@@ -239,9 +239,9 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
return {
restrict: 'E',
link: function(scope, elem, attrs) {
link: (scope, elem, attrs) => {
getModule(scope, attrs)
.then(function(componentInfo) {
.then(componentInfo => {
registerPluginComponent(scope, elem, attrs, componentInfo);
})
.catch(err => {
......
......@@ -10,7 +10,7 @@ import { CustomVariable } from './custom_variable';
import { ConstantVariable } from './constant_variable';
import { AdhocVariable } from './adhoc_variable';
coreModule.factory('templateSrv', function() {
coreModule.factory('templateSrv', () => {
return templateSrv;
});
......
......@@ -39,7 +39,7 @@ export class CustomVariable implements Variable {
updateOptions() {
// extract options in comma separated string
this.options = _.map(this.query.split(/[,]+/), function(text) {
this.options = _.map(this.query.split(/[,]+/), text => {
return { text: text.trim(), value: text.trim() };
});
......
......@@ -30,31 +30,31 @@ export class VariableEditorCtrl {
$scope.hideOptions = [{ value: 0, text: '' }, { value: 1, text: 'Label' }, { value: 2, text: 'Variable' }];
$scope.init = function() {
$scope.init = () => {
$scope.mode = 'list';
$scope.variables = variableSrv.variables;
$scope.reset();
$scope.$watch('mode', function(val) {
$scope.$watch('mode', val => {
if (val === 'new') {
$scope.reset();
}
});
};
$scope.setMode = function(mode) {
$scope.setMode = mode => {
$scope.mode = mode;
};
$scope.add = function() {
$scope.add = () => {
if ($scope.isValid()) {
variableSrv.addVariable($scope.current);
$scope.update();
}
};
$scope.isValid = function() {
$scope.isValid = () => {
if (!$scope.ctrl.form.$valid) {
return false;
}
......@@ -84,7 +84,7 @@ export class VariableEditorCtrl {
return true;
};
$scope.validate = function() {
$scope.validate = () => {
$scope.infoText = '';
if ($scope.current.type === 'adhoc' && $scope.current.datasource !== null) {
$scope.infoText = 'Adhoc filters are applied automatically to all queries that target this datasource';
......@@ -96,7 +96,7 @@ export class VariableEditorCtrl {
}
};
$scope.runQuery = function() {
$scope.runQuery = () => {
$scope.optionsLimit = 20;
return variableSrv.updateOptions($scope.current).catch(err => {
if (err.data && err.data.message) {
......@@ -106,23 +106,23 @@ export class VariableEditorCtrl {
});
};
$scope.edit = function(variable) {
$scope.edit = variable => {
$scope.current = variable;
$scope.currentIsNew = false;
$scope.mode = 'edit';
$scope.validate();
};
$scope.duplicate = function(variable) {
$scope.duplicate = variable => {
const clone = _.cloneDeep(variable.getSaveModel());
$scope.current = variableSrv.createVariableFromModel(clone);
$scope.current.name = 'copy_of_' + variable.name;
variableSrv.addVariable($scope.current);
};
$scope.update = function() {
$scope.update = () => {
if ($scope.isValid()) {
$scope.runQuery().then(function() {
$scope.runQuery().then(() => {
$scope.reset();
$scope.mode = 'list';
templateSrv.updateTemplateData();
......@@ -130,18 +130,18 @@ export class VariableEditorCtrl {
}
};
$scope.reset = function() {
$scope.reset = () => {
$scope.currentIsNew = true;
$scope.current = variableSrv.createVariableFromModel({ type: 'query' });
// this is done here in case a new data source type variable was added
$scope.datasources = _.filter(datasourceSrv.getMetricSources(), function(ds) {
$scope.datasources = _.filter(datasourceSrv.getMetricSources(), ds => {
return !ds.meta.mixed && ds.value !== null;
});
$scope.datasourceTypes = _($scope.datasources)
.uniqBy('meta.id')
.map(function(ds) {
.map(ds => {
return { text: ds.meta.name, value: ds.meta.id };
})
.value();
......@@ -164,11 +164,11 @@ export class VariableEditorCtrl {
$scope.validate();
};
$scope.removeVariable = function(variable) {
$scope.removeVariable = variable => {
variableSrv.removeVariable(variable);
};
$scope.showMoreOptions = function() {
$scope.showMoreOptions = () => {
$scope.optionsLimit += 20;
};
}
......
......@@ -65,7 +65,7 @@ export class IntervalVariable implements Variable {
updateOptions() {
// extract options between quotes and/or comma
this.options = _.map(this.query.match(/(["'])(.*?)\1|\w+/g), function(text) {
this.options = _.map(this.query.match(/(["'])(.*?)\1|\w+/g), text => {
text = text.replace(/["']+/g, '');
return { text: text.trim(), value: text.trim() };
});
......
......@@ -106,8 +106,8 @@ export class QueryVariable implements Variable {
getValuesForTag(tagKey) {
return this.datasourceSrv.get(this.datasource).then(datasource => {
const query = this.tagValuesQuery.replace('$tag', tagKey);
return this.metricFindQuery(datasource, query).then(function(results) {
return _.map(results, function(value) {
return this.metricFindQuery(datasource, query).then(results => {
return _.map(results, value => {
return value.text;
});
});
......
......@@ -77,7 +77,7 @@ export class TemplateSrv {
if (value instanceof Array && value.length === 0) {
return '__empty__';
}
const quotedValues = _.map(value, function(val) {
const quotedValues = _.map(value, val => {
return '"' + luceneEscape(val) + '"';
});
return '(' + quotedValues.join(' OR ') + ')';
......@@ -248,7 +248,7 @@ export class TemplateSrv {
}
fillVariableValuesForUrl(params, scopedVars) {
_.each(this.variables, function(variable) {
_.each(this.variables, variable => {
if (scopedVars && scopedVars[variable.name] !== void 0) {
if (scopedVars[variable.name].skipUrlSync) {
return;
......@@ -264,7 +264,7 @@ export class TemplateSrv {
}
distributeVariable(value, variable) {
value = _.map(value, function(val, index) {
value = _.map(value, (val, index) => {
if (index !== 0) {
return variable + '=' + val;
} else {
......
......@@ -122,12 +122,13 @@ export class VariableSrv {
}
const g = this.createGraph();
const promises = g
.getNode(variable.name)
.getOptimizedInputEdges()
.map(e => {
const node = g.getNode(variable.name);
let promises = [];
if (node) {
promises = node.getOptimizedInputEdges().map(e => {
return this.updateOptions(this.variables.find(v => v.name === e.inputNode.name));
});
}
return this.$q.all(promises).then(() => {
if (emitChangeEvents) {
......@@ -174,10 +175,10 @@ export class VariableSrv {
selected = variable.options[0];
} else {
selected = {
value: _.map(selected, function(val) {
value: _.map(selected, val => {
return val.value;
}),
text: _.map(selected, function(val) {
text: _.map(selected, val => {
return val.text;
}).join(' + '),
};
......@@ -249,7 +250,7 @@ export class VariableSrv {
const params = this.$location.search();
// remove variable params
_.each(params, function(value, key) {
_.each(params, (value, key) => {
if (key.indexOf('var-') === 0) {
delete params[key];
}
......
import _ from 'lodash';
export class PostgresConfigCtrl {
static templateUrl = 'partials/config.html';
current: any;
datasourceSrv: any;
showTimescaleDBHelp: boolean;
/** @ngInject */
constructor($scope, datasourceSrv) {
this.datasourceSrv = datasourceSrv;
this.current.jsonData.sslmode = this.current.jsonData.sslmode || 'verify-full';
this.current.jsonData.postgresVersion = this.current.jsonData.postgresVersion || 903;
this.showTimescaleDBHelp = false;
this.autoDetectFeatures();
}
autoDetectFeatures() {
if (!this.current.id) {
return;
}
this.datasourceSrv.loadDatasource(this.current.name).then(ds => {
return ds.getVersion().then(version => {
version = Number(version[0].text);
// timescaledb is only available for 9.6+
if (version >= 906) {
ds.getTimescaleDBVersion().then(version => {
if (version.length === 1) {
this.current.jsonData.timescaledb = true;
}
});
}
const major = Math.trunc(version / 100);
const minor = version % 100;
let name = String(major);
if (version < 1000) {
name = String(major) + '.' + String(minor);
}
if (!_.find(this.postgresVersions, (p: any) => p.value === version)) {
this.postgresVersions.push({ name: name, value: version });
}
this.current.jsonData.postgresVersion = version;
});
});
}
toggleTimescaleDBHelp() {
this.showTimescaleDBHelp = !this.showTimescaleDBHelp;
}
// the value portion is derived from postgres server_version_num/100
postgresVersions = [
{ name: '9.3', value: 903 },
{ name: '9.4', value: 904 },
{ name: '9.5', value: 905 },
{ name: '9.6', value: 906 },
{ name: '10', value: 1000 },
];
}
import _ from 'lodash';
import ResponseParser from './response_parser';
import PostgresQuery from 'app/plugins/datasource/postgres/postgres_query';
export class PostgresDatasource {
id: any;
name: any;
jsonData: any;
responseParser: ResponseParser;
queryModel: PostgresQuery;
/** @ngInject */
constructor(instanceSettings, private backendSrv, private $q, private templateSrv) {
constructor(instanceSettings, private backendSrv, private $q, private templateSrv, private timeSrv) {
this.name = instanceSettings.name;
this.id = instanceSettings.id;
this.jsonData = instanceSettings.jsonData;
this.responseParser = new ResponseParser(this.$q);
this.queryModel = new PostgresQuery({});
}
interpolateVariable(value, variable) {
if (typeof value === 'string') {
if (variable.multi || variable.includeAll) {
return "'" + value.replace(/'/g, `''`) + "'";
return this.queryModel.quoteLiteral(value);
} else {
return value;
}
......@@ -26,23 +31,25 @@ export class PostgresDatasource {
return value;
}
const quotedValues = _.map(value, function(val) {
return "'" + val.replace(/'/g, `''`) + "'";
const quotedValues = _.map(value, v => {
return this.queryModel.quoteLiteral(v);
});
return quotedValues.join(',');
}
query(options) {
const queries = _.filter(options.targets, item => {
return item.hide !== true;
}).map(item => {
const queries = _.filter(options.targets, target => {
return target.hide !== true;
}).map(target => {
const queryModel = new PostgresQuery(target, this.templateSrv, options.scopedVars);
return {
refId: item.refId,
refId: target.refId,
intervalMs: options.intervalMs,
maxDataPoints: options.maxDataPoints,
datasourceId: this.id,
rawSql: this.templateSrv.replace(item.rawSql, options.scopedVars, this.interpolateVariable),
format: item.format,
rawSql: queryModel.render(this.interpolateVariable),
format: target.format,
};
});
......@@ -103,17 +110,13 @@ export class PostgresDatasource {
format: 'table',
};
const range = this.timeSrv.timeRange();
const data = {
queries: [interpolatedQuery],
from: range.from.valueOf().toString(),
to: range.to.valueOf().toString(),
};
if (optionalOptions && optionalOptions.range && optionalOptions.range.from) {
data['from'] = optionalOptions.range.from.valueOf().toString();
}
if (optionalOptions && optionalOptions.range && optionalOptions.range.to) {
data['to'] = optionalOptions.range.to.valueOf().toString();
}
return this.backendSrv
.datasourceRequest({
url: '/api/tsdb/query',
......@@ -123,6 +126,14 @@ export class PostgresDatasource {
.then(data => this.responseParser.parseMetricFindQueryResult(refId, data));
}
getVersion() {
return this.metricFindQuery("SELECT current_setting('server_version_num')::int/100", {});
}
getTimescaleDBVersion() {
return this.metricFindQuery("SELECT extversion FROM pg_extension WHERE extname = 'timescaledb'", {});
}
testDatasource() {
return this.metricFindQuery('SELECT 1', {})
.then(res => {
......
export class PostgresMetaQuery {
constructor(private target, private queryModel) {}
getOperators(datatype: string) {
switch (datatype) {
case 'float4':
case 'float8': {
return ['=', '!=', '<', '<=', '>', '>='];
}
case 'text':
case 'varchar':
case 'char': {
return ['=', '!=', '<', '<=', '>', '>=', 'IN', 'NOT IN', 'LIKE', 'NOT LIKE', '~', '~*', '!~', '!~*'];
}
default: {
return ['=', '!=', '<', '<=', '>', '>=', 'IN', 'NOT IN'];
}
}
}
// quote identifier as literal to use in metadata queries
quoteIdentAsLiteral(value) {
return this.queryModel.quoteLiteral(this.queryModel.unquoteIdentifier(value));
}
findMetricTable() {
// query that returns first table found that has a timestamp(tz) column and a float column
const query = `
SELECT
quote_ident(table_name) as table_name,
( SELECT
quote_ident(column_name) as column_name
FROM information_schema.columns c
WHERE
c.table_schema = t.table_schema AND
c.table_name = t.table_name AND
udt_name IN ('timestamptz','timestamp')
ORDER BY ordinal_position LIMIT 1
) AS time_column,
( SELECT
quote_ident(column_name) AS column_name
FROM information_schema.columns c
WHERE
c.table_schema = t.table_schema AND
c.table_name = t.table_name AND
udt_name='float8'
ORDER BY ordinal_position LIMIT 1
) AS value_column
FROM information_schema.tables t
WHERE
table_schema IN (
SELECT CASE WHEN trim(unnest) = '"$user"' THEN user ELSE trim(unnest) END
FROM unnest(string_to_array(current_setting('search_path'),','))
) AND
EXISTS
( SELECT 1
FROM information_schema.columns c
WHERE
c.table_schema = t.table_schema AND
c.table_name = t.table_name AND
udt_name IN ('timestamptz','timestamp')
) AND
EXISTS
( SELECT 1
FROM information_schema.columns c
WHERE
c.table_schema = t.table_schema AND
c.table_name = t.table_name AND
udt_name='float8'
)
LIMIT 1
;`;
return query;
}
buildSchemaConstraint() {
const query = `
table_schema IN (
SELECT CASE WHEN trim(unnest) = \'"$user"\' THEN user ELSE trim(unnest) END
FROM unnest(string_to_array(current_setting(\'search_path\'),\',\'))
)`;
return query;
}
buildTableConstraint(table: string) {
let query = '';
// check for schema qualified table
if (table.includes('.')) {
const parts = table.split('.');
query = 'table_schema = ' + this.quoteIdentAsLiteral(parts[0]);
query += ' AND table_name = ' + this.quoteIdentAsLiteral(parts[1]);
return query;
} else {
query = `
table_schema IN (
SELECT CASE WHEN trim(unnest) = \'"$user"\' THEN user ELSE trim(unnest) END
FROM unnest(string_to_array(current_setting(\'search_path\'),\',\'))
)`;
query += ' AND table_name = ' + this.quoteIdentAsLiteral(table);
return query;
}
}
buildTableQuery() {
let query = 'SELECT quote_ident(table_name) FROM information_schema.tables WHERE ';
query += this.buildSchemaConstraint();
query += ' ORDER BY table_name';
return query;
}
buildColumnQuery(type?: string) {
let query = 'SELECT quote_ident(column_name) FROM information_schema.columns WHERE ';
query += this.buildTableConstraint(this.target.table);
switch (type) {
case 'time': {
query +=
" AND data_type IN ('timestamp without time zone','timestamp with time zone','bigint','integer','double precision','real')";
break;
}
case 'metric': {
query += " AND data_type IN ('text','character','character varying')";
break;
}
case 'value': {
query += " AND data_type IN ('bigint','integer','double precision','real')";
query += ' AND column_name <> ' + this.quoteIdentAsLiteral(this.target.timeColumn);
break;
}
case 'group': {
query += " AND data_type IN ('text','character','character varying')";
break;
}
}
query += ' ORDER BY column_name';
return query;
}
buildValueQuery(column: string) {
let query = 'SELECT DISTINCT quote_literal(' + column + ')';
query += ' FROM ' + this.target.table;
query += ' WHERE $__timeFilter(' + this.target.timeColumn + ')';
query += ' ORDER BY 1 LIMIT 100';
return query;
}
buildDatatypeQuery(column: string) {
let query = `
SELECT udt_name
FROM information_schema.columns
WHERE
table_schema IN (
SELECT schema FROM (
SELECT CASE WHEN trim(unnest) = \'"$user"\' THEN user ELSE trim(unnest) END as schema
FROM unnest(string_to_array(current_setting(\'search_path\'),\',\'))
) s
WHERE EXISTS (SELECT 1 FROM information_schema.schemata WHERE schema_name = s.schema)
)
`;
query += ' AND table_name = ' + this.quoteIdentAsLiteral(this.target.table);
query += ' AND column_name = ' + this.quoteIdentAsLiteral(column);
return query;
}
buildAggregateQuery() {
let query = 'SELECT DISTINCT proname FROM pg_aggregate ';
query += 'INNER JOIN pg_proc ON pg_aggregate.aggfnoid = pg_proc.oid ';
query += 'INNER JOIN pg_type ON pg_type.oid=pg_proc.prorettype ';
query += "WHERE pronargs=1 AND typname IN ('float8') AND aggkind='n' ORDER BY 1";
return query;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment