From df2f33b5b1077bcbf93caaf915c96224c5d98d4f Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Tue, 19 Feb 2019 13:08:29 +0100 Subject: [PATCH 01/15] add new issue templates --- .github/ISSUE_TEMPLATE/1-bug_report.md | 31 +++++++++++++++++++++ .github/ISSUE_TEMPLATE/2-feature_request.md | 28 +++++++++++++++++++ .github/ISSUE_TEMPLATE/3-question.md | 10 +++++++ 3 files changed, 69 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/1-bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/2-feature_request.md create mode 100644 .github/ISSUE_TEMPLATE/3-question.md diff --git a/.github/ISSUE_TEMPLATE/1-bug_report.md b/.github/ISSUE_TEMPLATE/1-bug_report.md new file mode 100644 index 00000000000..4414278becc --- /dev/null +++ b/.github/ISSUE_TEMPLATE/1-bug_report.md @@ -0,0 +1,31 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +Read before posting: + +- Questions should be posted to https://community.grafana.com +- Search/filter through opened and closed issues for existing similar bug reports: https://github.com/grafana/grafana/issues?utf8=%E2%9C%93&q=is%3Aissue +- Checkout FAQ: https://community.grafana.com/c/howto/faq +- Checkout How to troubleshoot metric query issues: https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50 +- Checkout Using Grafana’s Query Inspector to troubleshoot issues: https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630 + +Please answer and include relevant information below: + +### What Grafana version are you using? +### What datasource are you using? +### What OS are you running grafana on? +### What did you do? +### What was the expected result? +### What happened instead? +### If related to metric query / data viz +### Include raw network request & response +See Using Grafana’s Query Inspector to troubleshoot issues and/or How to troubleshoot metric query issues above. + +### Additional context +Add any other relevant context, like browser, platform and/or screenshots about the bug report here. diff --git a/.github/ISSUE_TEMPLATE/2-feature_request.md b/.github/ISSUE_TEMPLATE/2-feature_request.md new file mode 100644 index 00000000000..b0637ebf46f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/2-feature_request.md @@ -0,0 +1,28 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +Read before posting: + +- Questions should be posted to https://community.grafana.com +- Search through opened and closed issues for existing similar feature requests: https://github.com/grafana/grafana/issues?utf8=%E2%9C%93&q=is%3Aissue +- Write a short and descriptive title describing your feature, e.g. Support X in area Y + +Please answer and include below information: + +### Is your feature request related to a problem? Please describe. +A clear and concise description of what the problem is, e.g. I'm always frustrated when [...] + +### Describe possible solutions you'd like +A clear and concise description of what you want to happen. + +### Describe alternatives you've considered +A clear and concise description of any alternative solutions or features you've considered. + +### Additional context +Add any other relevant context, like Grafana version, browser, platform and/or screenshots about the feature request here. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/3-question.md b/.github/ISSUE_TEMPLATE/3-question.md new file mode 100644 index 00000000000..adaf6098a28 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/3-question.md @@ -0,0 +1,10 @@ +--- +name: Question +about: 'Questions should be posted to https://community.grafana.com/' +title: '' +labels: '' +assignees: '' + +--- + +Please ask questions on our community site, https://community.grafana.com/. Github are mainly for feature requests and bug reports. From 3895294f972ea8b1ecf09a1870919559dc7a149b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 6 Mar 2019 17:39:18 +0100 Subject: [PATCH 02/15] Revert "Fix for leaving playlist mode" --- .../dashboard/components/DashNav/DashNav.tsx | 43 +++++++++---------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/public/app/features/dashboard/components/DashNav/DashNav.tsx b/public/app/features/dashboard/components/DashNav/DashNav.tsx index d2f22d7d010..453c5d1f9ac 100644 --- a/public/app/features/dashboard/components/DashNav/DashNav.tsx +++ b/public/app/features/dashboard/components/DashNav/DashNav.tsx @@ -8,7 +8,6 @@ import { appEvents } from 'app/core/app_events'; import { PlaylistSrv } from 'app/features/playlist/playlist_srv'; // Components -import { ClickOutsideWrapper } from 'app/core/components/ClickOutsideWrapper/ClickOutsideWrapper'; import { DashNavButton } from './DashNavButton'; import { Tooltip } from '@grafana/ui'; @@ -174,28 +173,26 @@ export class DashNav extends PureComponent { {this.renderDashboardTitleSearchButton()} {this.playlistSrv.isPlaying && ( - -
- - - -
- +
+ + + +
)}
From a59e0f1b5586b233fdf0ce93f4eda4b936f4659f Mon Sep 17 00:00:00 2001 From: Andrej Ocenas Date: Wed, 6 Mar 2019 22:30:40 +0100 Subject: [PATCH 03/15] Map dataSourceTypeSearchQuery state from redux to search input. --- public/app/features/datasources/NewDataSourcePage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/public/app/features/datasources/NewDataSourcePage.tsx b/public/app/features/datasources/NewDataSourcePage.tsx index 7b028a4e3ea..b572bacc1a1 100644 --- a/public/app/features/datasources/NewDataSourcePage.tsx +++ b/public/app/features/datasources/NewDataSourcePage.tsx @@ -70,6 +70,7 @@ function mapStateToProps(state: StoreState) { return { navModel: getNavModel(state.navIndex, 'datasources'), dataSourceTypes: getDataSourceTypes(state.dataSources), + dataSourceTypeSearchQuery: state.dataSources.dataSourceTypeSearchQuery, isLoading: state.dataSources.isLoadingDataSources, }; } From 82326fed42053a2926baacdb0810d75c4740467f Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 6 Mar 2019 15:18:24 -0800 Subject: [PATCH 04/15] return the same panelData unless it changes --- .../features/dashboard/dashgrid/DataPanel.tsx | 12 +++--- public/app/plugins/panel/gauge/GaugePanel.tsx | 43 +++++++++++++------ 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/public/app/features/dashboard/dashgrid/DataPanel.tsx b/public/app/features/dashboard/dashgrid/DataPanel.tsx index ae3486e40fe..09864d85960 100644 --- a/public/app/features/dashboard/dashgrid/DataPanel.tsx +++ b/public/app/features/dashboard/dashgrid/DataPanel.tsx @@ -44,6 +44,7 @@ export interface State { isFirstLoad: boolean; loading: LoadingState; response: DataQueryResponse; + panelData: PanelData; } export class DataPanel extends Component { @@ -63,6 +64,7 @@ export class DataPanel extends Component { response: { data: [], }, + panelData: {}, isFirstLoad: true, }; } @@ -147,6 +149,7 @@ export class DataPanel extends Component { this.setState({ loading: LoadingState.Done, response: resp, + panelData: this.getPanelData(resp), isFirstLoad: false, }); } catch (err) { @@ -169,9 +172,7 @@ export class DataPanel extends Component { } }; - getPanelData = () => { - const { response } = this.state; - + getPanelData(response: DataQueryResponse) { if (response.data.length > 0 && (response.data[0] as TableData).type === 'table') { return { tableData: response.data[0] as TableData, @@ -183,12 +184,11 @@ export class DataPanel extends Component { timeSeries: response.data as TimeSeries[], tableData: null, }; - }; + } render() { const { queries } = this.props; - const { loading, isFirstLoad } = this.state; - const panelData = this.getPanelData(); + const { loading, isFirstLoad, panelData } = this.state; // do not render component until we have first data if (isFirstLoad && (loading === LoadingState.Loading || loading === LoadingState.NotStarted)) { diff --git a/public/app/plugins/panel/gauge/GaugePanel.tsx b/public/app/plugins/panel/gauge/GaugePanel.tsx index 2a42e31b9ab..b75d4a1c7f3 100644 --- a/public/app/plugins/panel/gauge/GaugePanel.tsx +++ b/public/app/plugins/panel/gauge/GaugePanel.tsx @@ -1,5 +1,5 @@ // Libraries -import React, { PureComponent } from 'react'; +import React, { Component } from 'react'; // Services & Utils import { processTimeSeries, ThemeContext } from '@grafana/ui'; @@ -12,16 +12,28 @@ import { GaugeOptions } from './types'; import { PanelProps, NullValueMode, TimeSeriesValue } from '@grafana/ui/src/types'; interface Props extends PanelProps {} +interface State { + value: TimeSeriesValue; +} -export class GaugePanel extends PureComponent { - render() { - const { panelData, width, height, replaceVariables, options } = this.props; +export class GaugePanel extends Component { + constructor(props: Props) { + super(props); + this.state = { + value: this.findValue(props), + }; + } + + componentDidUpdate(prevProps: Props) { + if (this.props.panelData !== prevProps.panelData) { + this.setState({ value: this.findValue(this.props) }); + } + } + + findValue(props: Props): number | null { + const { panelData, options } = props; const { valueOptions } = options; - const prefix = replaceVariables(valueOptions.prefix); - const suffix = replaceVariables(valueOptions.suffix); - let value: TimeSeriesValue; - if (panelData.timeSeries) { const vmSeries = processTimeSeries({ timeSeries: panelData.timeSeries, @@ -29,14 +41,21 @@ export class GaugePanel extends PureComponent { }); if (vmSeries[0]) { - value = vmSeries[0].stats[valueOptions.stat]; - } else { - value = null; + return vmSeries[0].stats[valueOptions.stat]; } } else if (panelData.tableData) { - value = panelData.tableData.rows[0].find(prop => prop > 0); + return panelData.tableData.rows[0].find(prop => prop > 0); } + return null; + } + render() { + const { width, height, replaceVariables, options } = this.props; + const { valueOptions } = options; + const { value } = this.state; + + const prefix = replaceVariables(valueOptions.prefix); + const suffix = replaceVariables(valueOptions.suffix); return ( {theme => ( From 272b561958604d97cf21890cd665812c6d637cf4 Mon Sep 17 00:00:00 2001 From: Shaffer John Date: Thu, 7 Mar 2019 11:09:17 +0800 Subject: [PATCH 05/15] Update upgrading.md for wrong spell --- docs/sources/installation/upgrading.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sources/installation/upgrading.md b/docs/sources/installation/upgrading.md index e235f25b9e9..511d6117eb3 100644 --- a/docs/sources/installation/upgrading.md +++ b/docs/sources/installation/upgrading.md @@ -120,7 +120,7 @@ If you're using systemd and have a large amount of annotations consider temporar ## Upgrading to v6.0 -If you have text panels with script tags they will no longer work due to a new setting that per default disallow unsanitzied HTML. +If you have text panels with script tags they will no longer work due to a new setting that per default disallow unsanitized HTML. Read more [here](/installation/configuration/#disable-sanitize-html) about this new setting. ### Authentication and security @@ -147,4 +147,4 @@ login_maximum_inactive_lifetime_days = 1 login_maximum_lifetime_days = 1 ``` -The default cookie name for storing the auth token is `grafana_session`. you can configure this with `login_cookie_name` in `[auth]` settings. \ No newline at end of file +The default cookie name for storing the auth token is `grafana_session`. you can configure this with `login_cookie_name` in `[auth]` settings. From f3dbdfac07f94a4f4406588cc4da9ce7d79b4d3f Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Thu, 7 Mar 2019 10:32:36 +0100 Subject: [PATCH 06/15] fix: Make sure we dont add &autofitpanels to the url if it already exists #15849 --- public/app/core/services/keybindingSrv.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts index da096f261c6..2473c1b8e36 100644 --- a/public/app/core/services/keybindingSrv.ts +++ b/public/app/core/services/keybindingSrv.ts @@ -4,6 +4,7 @@ import _ from 'lodash'; import coreModule from 'app/core/core_module'; import appEvents from 'app/core/app_events'; import { getExploreUrl } from 'app/core/utils/explore'; +import { store } from 'app/store/store'; import Mousetrap from 'mousetrap'; import 'mousetrap-global-bind'; @@ -294,7 +295,9 @@ export class KeybindingSrv { //Autofit panels this.bind('d a', () => { // this has to be a full page reload - window.location.href = window.location.href + '&autofitpanels'; + const queryParams = store.getState().location.query; + const newUrlParam = queryParams.autofitpanels ? '' : '&autofitpanels'; + window.location.href = window.location.href + newUrlParam; }); } } From d937f1ff2110612c92d33e4123945ed6d3c36d1c Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Thu, 7 Mar 2019 10:52:24 +0100 Subject: [PATCH 07/15] fix: Update error message and replace npm with yarn #15851 --- public/views/index-template.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/views/index-template.html b/public/views/index-template.html index 895b0e4ae19..ad28821230f 100644 --- a/public/views/index-template.html +++ b/public/views/index-template.html @@ -179,8 +179,7 @@

1. This could be caused by your reverse proxy settings.

2. If you host grafana under subpath make sure your grafana.ini root_url setting includes subpath

- 3. If you have a local dev build make sure you build frontend using: npm run dev, npm run watch, or npm run - build

+ 3. If you have a local dev build make sure you build frontend using: yarn start, yarn start:hot, or yarn build

4. Sometimes restarting grafana-server can help

From da49fecc30d5fe181dc03649a6fa6c063a02a952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 7 Mar 2019 10:55:16 +0100 Subject: [PATCH 08/15] Updated templates --- .github/ISSUE_TEMPLATE.md | 16 --------- .github/ISSUE_TEMPLATE/1-bug_report.md | 40 ++++++++++----------- .github/ISSUE_TEMPLATE/2-feature_request.md | 27 ++++---------- .github/ISSUE_TEMPLATE/3-accessibility.md | 26 ++++++++++++++ .github/ISSUE_TEMPLATE/3-question.md | 10 ------ .github/ISSUE_TEMPLATE/4-question.md | 14 ++++++++ 6 files changed, 65 insertions(+), 68 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/ISSUE_TEMPLATE/3-accessibility.md delete mode 100644 .github/ISSUE_TEMPLATE/3-question.md create mode 100644 .github/ISSUE_TEMPLATE/4-question.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 8086a6b86e5..00000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,16 +0,0 @@ -Read before posting: - -- Questions should be posted to https://community.grafana.com. Please search there and here on GitHub for similar issues before creating a new issue. -- Checkout FAQ: https://community.grafana.com/c/howto/faq -- Checkout How to troubleshoot metric query issues: https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50 - -Please include this information: -### What Grafana version are you using? -### What datasource are you using? -### What OS are you running grafana on? -### What did you do? -### What was the expected result? -### What happened instead? -### If related to metric query / data viz: -### Include raw network request & response: get by opening Chrome Dev Tools (F12, Ctrl+Shift+I on windows, Cmd+Opt+I on Mac), go the network tab. - diff --git a/.github/ISSUE_TEMPLATE/1-bug_report.md b/.github/ISSUE_TEMPLATE/1-bug_report.md index 4414278becc..544ddab89e9 100644 --- a/.github/ISSUE_TEMPLATE/1-bug_report.md +++ b/.github/ISSUE_TEMPLATE/1-bug_report.md @@ -1,31 +1,29 @@ --- name: Bug report -about: Create a report to help us improve +about: Report a bug you found when using Grafana title: '' -labels: '' +labels: 'type: bug' assignees: '' - --- -Read before posting: + -- Questions should be posted to https://community.grafana.com -- Search/filter through opened and closed issues for existing similar bug reports: https://github.com/grafana/grafana/issues?utf8=%E2%9C%93&q=is%3Aissue -- Checkout FAQ: https://community.grafana.com/c/howto/faq -- Checkout How to troubleshoot metric query issues: https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50 -- Checkout Using Grafana’s Query Inspector to troubleshoot issues: https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630 +**What happened**: -Please answer and include relevant information below: +**What you expected to happen**: -### What Grafana version are you using? -### What datasource are you using? -### What OS are you running grafana on? -### What did you do? -### What was the expected result? -### What happened instead? -### If related to metric query / data viz -### Include raw network request & response -See Using Grafana’s Query Inspector to troubleshoot issues and/or How to troubleshoot metric query issues above. +**How to reproduce it (as minimally and precisely as possible)**: -### Additional context -Add any other relevant context, like browser, platform and/or screenshots about the bug report here. +**Anything else we need to know?**: + +**Environment**: +- Grafana version: +- Data source type & version: +- OS Grafana is installed on: +- User OS & Browser: +- Grafana plugins: +- Others: diff --git a/.github/ISSUE_TEMPLATE/2-feature_request.md b/.github/ISSUE_TEMPLATE/2-feature_request.md index b0637ebf46f..17e72c6f1ca 100644 --- a/.github/ISSUE_TEMPLATE/2-feature_request.md +++ b/.github/ISSUE_TEMPLATE/2-feature_request.md @@ -1,28 +1,13 @@ --- -name: Feature request -about: Suggest an idea for this project +name: Enhancement Request +about: Suggest an enhancement or new feature for the Grafana project title: '' -labels: '' +labels: 'type: feature request' assignees: '' - --- -Read before posting: + -- Questions should be posted to https://community.grafana.com -- Search through opened and closed issues for existing similar feature requests: https://github.com/grafana/grafana/issues?utf8=%E2%9C%93&q=is%3Aissue -- Write a short and descriptive title describing your feature, e.g. Support X in area Y +**What would you like to be added**: -Please answer and include below information: - -### Is your feature request related to a problem? Please describe. -A clear and concise description of what the problem is, e.g. I'm always frustrated when [...] - -### Describe possible solutions you'd like -A clear and concise description of what you want to happen. - -### Describe alternatives you've considered -A clear and concise description of any alternative solutions or features you've considered. - -### Additional context -Add any other relevant context, like Grafana version, browser, platform and/or screenshots about the feature request here. \ No newline at end of file +**Why is this needed**: diff --git a/.github/ISSUE_TEMPLATE/3-accessibility.md b/.github/ISSUE_TEMPLATE/3-accessibility.md new file mode 100644 index 00000000000..c8a2d899ff6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/3-accessibility.md @@ -0,0 +1,26 @@ +--- +name: Accessibility problem or improvement request +about: Help make Grafana be better at keyboard navigation, screen-readable and accessible to all. +labels: 'type: accessibility' +--- + + + +**Steps to reproduce**: + +**Actual Result**: + +**Expected Result** + +**Relevant WCAG Criteria:** [#.#.# WCAG Criterion](link to https://www.w3.org/WAI/WCAG21/quickref/?versions=2.0) + +**Environment**: +- Grafana version: +- Data source type & version: +- User OS & Browser: +- Others: diff --git a/.github/ISSUE_TEMPLATE/3-question.md b/.github/ISSUE_TEMPLATE/3-question.md deleted file mode 100644 index adaf6098a28..00000000000 --- a/.github/ISSUE_TEMPLATE/3-question.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Question -about: 'Questions should be posted to https://community.grafana.com/' -title: '' -labels: '' -assignees: '' - ---- - -Please ask questions on our community site, https://community.grafana.com/. Github are mainly for feature requests and bug reports. diff --git a/.github/ISSUE_TEMPLATE/4-question.md b/.github/ISSUE_TEMPLATE/4-question.md new file mode 100644 index 00000000000..7ee98327e4c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/4-question.md @@ -0,0 +1,14 @@ +--- +name: Question / Support request +about: 'Question or support request relating to using Grafana' +title: '' +labels: '' +assignees: '' +--- + +STOP -- PLEASE READ! + +GitHub is not the right place for questions and support requests. + +Please ask questions on our community site: [https://community.grafana.com/](https://community.grafana.com/) + From ec1bb7b995dfddb4dfa613d3829f4fdad4742996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 7 Mar 2019 11:07:01 +0100 Subject: [PATCH 09/15] Updated issue templates --- .github/ISSUE_TEMPLATE/1-bug_report.md | 4 +--- .github/ISSUE_TEMPLATE/2-feature_request.md | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1-bug_report.md b/.github/ISSUE_TEMPLATE/1-bug_report.md index 544ddab89e9..eb87a7fc1c9 100644 --- a/.github/ISSUE_TEMPLATE/1-bug_report.md +++ b/.github/ISSUE_TEMPLATE/1-bug_report.md @@ -1,15 +1,13 @@ --- name: Bug report about: Report a bug you found when using Grafana -title: '' labels: 'type: bug' -assignees: '' --- **What happened**: diff --git a/.github/ISSUE_TEMPLATE/2-feature_request.md b/.github/ISSUE_TEMPLATE/2-feature_request.md index 17e72c6f1ca..0a8b2a63a72 100644 --- a/.github/ISSUE_TEMPLATE/2-feature_request.md +++ b/.github/ISSUE_TEMPLATE/2-feature_request.md @@ -1,9 +1,7 @@ --- name: Enhancement Request about: Suggest an enhancement or new feature for the Grafana project -title: '' labels: 'type: feature request' -assignees: '' --- From 067f0561d6c07413a9fe653c74fa680597bfc6e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 7 Mar 2019 11:09:16 +0100 Subject: [PATCH 10/15] Updated issue template titles --- .github/ISSUE_TEMPLATE/3-accessibility.md | 2 +- .github/ISSUE_TEMPLATE/4-question.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/3-accessibility.md b/.github/ISSUE_TEMPLATE/3-accessibility.md index c8a2d899ff6..51b3ecc255b 100644 --- a/.github/ISSUE_TEMPLATE/3-accessibility.md +++ b/.github/ISSUE_TEMPLATE/3-accessibility.md @@ -1,5 +1,5 @@ --- -name: Accessibility problem or improvement request +name: Accessibility issue about: Help make Grafana be better at keyboard navigation, screen-readable and accessible to all. labels: 'type: accessibility' --- diff --git a/.github/ISSUE_TEMPLATE/4-question.md b/.github/ISSUE_TEMPLATE/4-question.md index 7ee98327e4c..3e3a20e49ed 100644 --- a/.github/ISSUE_TEMPLATE/4-question.md +++ b/.github/ISSUE_TEMPLATE/4-question.md @@ -1,5 +1,5 @@ --- -name: Question / Support request +name: Support request about: 'Question or support request relating to using Grafana' title: '' labels: '' From 708fd6df21ce86add7593677d58e223a90c3019c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 7 Mar 2019 11:12:43 +0100 Subject: [PATCH 11/15] Removed title case from issue template title --- .github/ISSUE_TEMPLATE/2-feature_request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/2-feature_request.md b/.github/ISSUE_TEMPLATE/2-feature_request.md index 0a8b2a63a72..ccb9f3cc391 100644 --- a/.github/ISSUE_TEMPLATE/2-feature_request.md +++ b/.github/ISSUE_TEMPLATE/2-feature_request.md @@ -1,5 +1,5 @@ --- -name: Enhancement Request +name: Enhancement request about: Suggest an enhancement or new feature for the Grafana project labels: 'type: feature request' --- From 8892b933e8fbbf8e0158b5eb3c318605a588da2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 7 Mar 2019 11:41:07 +0100 Subject: [PATCH 12/15] Updated pull request rtemplate --- .github/PULL_REQUEST_TEMPLATE.md | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 69ce3168730..4420908c6b8 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,26 @@ -* Follow the contribution guidelines in [`CONTRIBUTING.md`](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) -* Rebase your PR if it gets out of sync with master -* Include `closes #` or a link to the issue in the description + + +**What this PR does / why we need it**: + +**Which issue(s) this PR fixes**: + +Fixes # + +**Special notes for your reviewer**: + +**Release note**: + +```release-note + +``` From f71d45b1c172de332a30cbdc9fb68defd3beb9da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 7 Mar 2019 12:10:25 +0100 Subject: [PATCH 13/15] Updated pull request template --- .github/PULL_REQUEST_TEMPLATE.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 4420908c6b8..5ecbc8397df 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,7 +3,8 @@ 1. If this is your first time, please read our [`CONTRIBUTING.md`](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guide. 2. Ensure you have added or ran the appropriate tests for your PR. 3. If it's a new feature or config option it will need a docs update. Docs are under the docs folder in repo root. -6. If the PR is unfinished, mark it as a draft PR. +4. If the PR is unfinished, mark it as a draft PR. +5. Rebase your PR if it gets out of sync with master --> **What this PR does / why we need it**: From 312ce88e2528b8f6ef04b2b0299d4a54981c595c Mon Sep 17 00:00:00 2001 From: Dominik Prokop Date: Thu, 7 Mar 2019 13:12:10 +0100 Subject: [PATCH 14/15] Update core:start cli command to watch theme changes again (#15856) --- scripts/cli/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cli/index.ts b/scripts/cli/index.ts index ced56e1eacd..301592315bc 100644 --- a/scripts/cli/index.ts +++ b/scripts/cli/index.ts @@ -16,7 +16,7 @@ program .description('Starts Grafana front-end in development mode with watch enabled') .action(async cmd => { await execTask(startTask)({ - watchThemes: cmd.theme, + watchThemes: cmd.watchTheme, hot: cmd.hot, }); }); From f9e3c33ebdffbd930ddcc776753a76c4254c72b2 Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Thu, 7 Mar 2019 14:33:37 -0500 Subject: [PATCH 15/15] Update README.md --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 550e7facfa8..8c84bfd0e87 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,6 @@ Grafana is an open source, feature rich metrics dashboard and graph editor for Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB. -![](https://www.grafanacon.org/2019/images/grafanacon_la_nav-logo.png) - -Join us Feb 25-26 in Los Angeles, California for GrafanaCon - a two-day event with talks focused on Grafana and the surrounding open source monitoring ecosystem. Get deep dives into Loki, the Explore workflow and all of the new features of Grafana 6, plus participate in hands on workshops to help you get the most out of your data. - -Time is running out - grab your ticket now! http://grafanacon.org -