Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build: Fix bug where grafana didn't start after mysql on rpm packages #16917

Merged
merged 1 commit into from May 7, 2019
Merged

Build: Fix bug where grafana didn't start after mysql on rpm packages #16917

merged 1 commit into from May 7, 2019

Conversation

bergquist
Copy link
Contributor

closes #16850

marefr
marefr approved these changes May 7, 2019
View reviewed changes
Copy link
Member

@marefr marefr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bergquist bergquist merged commit b8674f4 into grafana:master May 7, 2019
@bergquist bergquist deleted the rpm_package branch May 7, 2019 07:47
@bergquist bergquist changed the title rpm: start grafana after mysqld process build: fix bug where grafana didn't start after mysql on rpm packages. May 7, 2019
@bergquist bergquist changed the title build: fix bug where grafana didn't start after mysql on rpm packages. Build: fix bug where grafana didn't start after mysql on rpm packages. May 7, 2019
@marefr marefr changed the title Build: fix bug where grafana didn't start after mysql on rpm packages. Build: Fix bug where grafana didn't start after mysql on rpm packages. May 7, 2019
@marefr marefr added this to the 6.2-beta1 milestone May 7, 2019
@marefr marefr changed the title Build: Fix bug where grafana didn't start after mysql on rpm packages. Build: Fix bug where grafana didn't start after mysql on rpm packages May 7, 2019
ryantxu added a commit to ryantxu/grafana that referenced this pull request May 8, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into useQueryRunner-in-…
b14a513 
…MetricPanelCtrl

* grafana/master: (30 commits)
  Plugins: update beta notice style (grafana#16928)
  Chore: update version number for 6.3 (grafana#16927)
  Plugins: Support templated urls in routes (grafana#16599)
  changelog: add 5.4.4 release
  docs: add download link to what's new in v6.2
  update changelog
  Update changelog for 6.2.0-beta1
  AzureMonitor: adds support for multiple subscriptions per datasource (grafana#16922)
  docs: what's new in v6.2 (grafana#16909)
  Chore: ban importing from @grafana/ui in grafana ui files (grafana#16920)
  BarGauge: New multi series enabled gauge like panel with horizontal and vertical layouts and 3 display modes (grafana#16918)
  alerting: no notification when going from nodata -> pending (grafana#16905)
  rpm: start grafana after mysqld process (grafana#16917)
  Build: fix failing grafana/ui build (grafana#16913)
  BarGauge: Updated test dashboards and threshold fix (grafana#16911)
  PanelModel: Clear queryRunner on destroy (grafana#16906)
  Panels: No title will no longer make panel header take up space (grafana#16884)
  Elasticsearch: Fix pre-v7.0 and alerting error (grafana#16904)
  Gauge: Better handling of gauge repeat title (grafana#16886)
  Refactor: move datemath to grafana/ui (grafana#16890)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request May 8, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into timepicker-tooltip
1cdf5e9 
* grafana/master: (171 commits)
  Plugins: update beta notice style (grafana#16928)
  Chore: update version number for 6.3 (grafana#16927)
  Plugins: Support templated urls in routes (grafana#16599)
  changelog: add 5.4.4 release
  docs: add download link to what's new in v6.2
  update changelog
  Update changelog for 6.2.0-beta1
  AzureMonitor: adds support for multiple subscriptions per datasource (grafana#16922)
  docs: what's new in v6.2 (grafana#16909)
  Chore: ban importing from @grafana/ui in grafana ui files (grafana#16920)
  BarGauge: New multi series enabled gauge like panel with horizontal and vertical layouts and 3 display modes (grafana#16918)
  alerting: no notification when going from nodata -> pending (grafana#16905)
  rpm: start grafana after mysqld process (grafana#16917)
  Build: fix failing grafana/ui build (grafana#16913)
  BarGauge: Updated test dashboards and threshold fix (grafana#16911)
  PanelModel: Clear queryRunner on destroy (grafana#16906)
  Panels: No title will no longer make panel header take up space (grafana#16884)
  Elasticsearch: Fix pre-v7.0 and alerting error (grafana#16904)
  Gauge: Better handling of gauge repeat title (grafana#16886)
  Refactor: move datemath to grafana/ui (grafana#16890)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request May 8, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into tables-display
7a32962 
* grafana/master: (54 commits)
  Plugins: update beta notice style (grafana#16928)
  Chore: update version number for 6.3 (grafana#16927)
  Plugins: Support templated urls in routes (grafana#16599)
  changelog: add 5.4.4 release
  docs: add download link to what's new in v6.2
  update changelog
  Update changelog for 6.2.0-beta1
  AzureMonitor: adds support for multiple subscriptions per datasource (grafana#16922)
  docs: what's new in v6.2 (grafana#16909)
  Chore: ban importing from @grafana/ui in grafana ui files (grafana#16920)
  BarGauge: New multi series enabled gauge like panel with horizontal and vertical layouts and 3 display modes (grafana#16918)
  alerting: no notification when going from nodata -> pending (grafana#16905)
  rpm: start grafana after mysqld process (grafana#16917)
  Build: fix failing grafana/ui build (grafana#16913)
  BarGauge: Updated test dashboards and threshold fix (grafana#16911)
  PanelModel: Clear queryRunner on destroy (grafana#16906)
  Panels: No title will no longer make panel header take up space (grafana#16884)
  Elasticsearch: Fix pre-v7.0 and alerting error (grafana#16904)
  Gauge: Better handling of gauge repeat title (grafana#16886)
  Refactor: move datemath to grafana/ui (grafana#16890)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request May 8, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into dynamic-height-panels
7aeb017 
* grafana/master:
  Plugins: update beta notice style (grafana#16928)
  Chore: update version number for 6.3 (grafana#16927)
  Plugins: Support templated urls in routes (grafana#16599)
  changelog: add 5.4.4 release
  docs: add download link to what's new in v6.2
  update changelog
  Update changelog for 6.2.0-beta1
  AzureMonitor: adds support for multiple subscriptions per datasource (grafana#16922)
  docs: what's new in v6.2 (grafana#16909)
  Chore: ban importing from @grafana/ui in grafana ui files (grafana#16920)
  BarGauge: New multi series enabled gauge like panel with horizontal and vertical layouts and 3 display modes (grafana#16918)
  alerting: no notification when going from nodata -> pending (grafana#16905)
  rpm: start grafana after mysqld process (grafana#16917)
  Build: fix failing grafana/ui build (grafana#16913)
  BarGauge: Updated test dashboards and threshold fix (grafana#16911)
ryantxu added a commit to ryantxu/grafana that referenced this pull request May 8, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into dynamic-units
78aad5f 
* grafana/master: (74 commits)
  Plugins: update beta notice style (grafana#16928)
  Chore: update version number for 6.3 (grafana#16927)
  Plugins: Support templated urls in routes (grafana#16599)
  changelog: add 5.4.4 release
  docs: add download link to what's new in v6.2
  update changelog
  Update changelog for 6.2.0-beta1
  AzureMonitor: adds support for multiple subscriptions per datasource (grafana#16922)
  docs: what's new in v6.2 (grafana#16909)
  Chore: ban importing from @grafana/ui in grafana ui files (grafana#16920)
  BarGauge: New multi series enabled gauge like panel with horizontal and vertical layouts and 3 display modes (grafana#16918)
  alerting: no notification when going from nodata -> pending (grafana#16905)
  rpm: start grafana after mysqld process (grafana#16917)
  Build: fix failing grafana/ui build (grafana#16913)
  BarGauge: Updated test dashboards and threshold fix (grafana#16911)
  PanelModel: Clear queryRunner on destroy (grafana#16906)
  Panels: No title will no longer make panel header take up space (grafana#16884)
  Elasticsearch: Fix pre-v7.0 and alerting error (grafana#16904)
  Gauge: Better handling of gauge repeat title (grafana#16886)
  Refactor: move datemath to grafana/ui (grafana#16890)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marefr marefr marefr approved these changes

Assignees
No one assigned
Labels
add to changelog type/bug type/build-packaging
Projects
None yet
Milestone
6.2-beta1
Development

Successfully merging this pull request may close these issues.

Fix systemd script in RPM package when used with MySQL
2 participants
@bergquist @marefr