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

Devenv: Add nginx proxy for mac to devenv #17572

Merged
merged 1 commit into from Jun 13, 2019
Merged

Devenv: Add nginx proxy for mac to devenv #17572

merged 1 commit into from Jun 13, 2019

Conversation

aocenas
Copy link
Member

@aocenas aocenas commented Jun 13, 2019

Add mac specific proxy setup because of issues with networking otherwise it is the same os the base one.

@aocenas aocenas added the area/devenv developer environment related label Jun 13, 2019
torkelo
torkelo approved these changes Jun 13, 2019
View reviewed changes
Copy link
Member

@torkelo torkelo left a comment

Choose a reason for hiding this comment

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

Looks good!

@aocenas aocenas merged commit 97f7c92 into master Jun 13, 2019
@aocenas aocenas deleted the devenv-nginix-proxy-mac branch June 13, 2019 19:29
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jun 17, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into more-packages
9272ff0 
* grafana/master: (58 commits)
  AppPlugin: Fix load legacy plugin app (grafana#17574)
  Typescript: A batch of implicit any fixes (grafana#17590)
  RefreshPicker: Handle empty intervals (grafana#17585)
  Docker: Switch base to ubuntu:latest (grafana#17066)
  SQLStore: extend `user.SearchUsers` method (grafana#17514)
  Explore: Tag and Values for Influx are filtered by the selected measurement (grafana#17539)
  ldap: makes mocks available for testing. (grafana#17576)
  Devenv: Add nginx proxy for mac (grafana#17572)
  Graph: Added new fill gradient option (grafana#17528)
  Typescript: Reduce implicit any errors (grafana#17550)
  SinglestatPanel: Manages when getColorForValue() function returns null value. Closes grafana#9747 (grafana#17552)
  LDAP: refactoring  (grafana#17479)
  Elasticsearch: Fix empty query request to send properly (grafana#17488)
  SinglestatPanel: fix min/max config in singlestat sparklines (grafana#17543)
  AuthProxy: Optimistic lock pattern for remote cache Set (grafana#17485)
  Explore: Includes context parameter when invoking getExploreState() from Prometheus datasource (grafana#17569)
  Tests: Replaces truth image (grafana#17570)
  Fix: Fixes merge conflict (grafana#17568)
  Build: Fix failing e2e tests and implicit any check (grafana#17567)
  Explore: Fixes implicit any error in AdHocFilterField.test.tsx (grafana#17565)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jun 17, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into move-threshold-and…
abf3ecc 
…-mapping-to-field

* grafana/master: (75 commits)
  AppPlugin: Fix load legacy plugin app (grafana#17574)
  Typescript: A batch of implicit any fixes (grafana#17590)
  RefreshPicker: Handle empty intervals (grafana#17585)
  Docker: Switch base to ubuntu:latest (grafana#17066)
  SQLStore: extend `user.SearchUsers` method (grafana#17514)
  Explore: Tag and Values for Influx are filtered by the selected measurement (grafana#17539)
  ldap: makes mocks available for testing. (grafana#17576)
  Devenv: Add nginx proxy for mac (grafana#17572)
  Graph: Added new fill gradient option (grafana#17528)
  Typescript: Reduce implicit any errors (grafana#17550)
  SinglestatPanel: Manages when getColorForValue() function returns null value. Closes grafana#9747 (grafana#17552)
  LDAP: refactoring  (grafana#17479)
  Elasticsearch: Fix empty query request to send properly (grafana#17488)
  SinglestatPanel: fix min/max config in singlestat sparklines (grafana#17543)
  AuthProxy: Optimistic lock pattern for remote cache Set (grafana#17485)
  Explore: Includes context parameter when invoking getExploreState() from Prometheus datasource (grafana#17569)
  Tests: Replaces truth image (grafana#17570)
  Fix: Fixes merge conflict (grafana#17568)
  Build: Fix failing e2e tests and implicit any check (grafana#17567)
  Explore: Fixes implicit any error in AdHocFilterField.test.tsx (grafana#17565)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jun 17, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into extensions
9e27ba6 
* grafana/master: (73 commits)
  AppPlugin: Fix load legacy plugin app (grafana#17574)
  Typescript: A batch of implicit any fixes (grafana#17590)
  RefreshPicker: Handle empty intervals (grafana#17585)
  Docker: Switch base to ubuntu:latest (grafana#17066)
  SQLStore: extend `user.SearchUsers` method (grafana#17514)
  Explore: Tag and Values for Influx are filtered by the selected measurement (grafana#17539)
  ldap: makes mocks available for testing. (grafana#17576)
  Devenv: Add nginx proxy for mac (grafana#17572)
  Graph: Added new fill gradient option (grafana#17528)
  Typescript: Reduce implicit any errors (grafana#17550)
  SinglestatPanel: Manages when getColorForValue() function returns null value. Closes grafana#9747 (grafana#17552)
  LDAP: refactoring  (grafana#17479)
  Elasticsearch: Fix empty query request to send properly (grafana#17488)
  SinglestatPanel: fix min/max config in singlestat sparklines (grafana#17543)
  AuthProxy: Optimistic lock pattern for remote cache Set (grafana#17485)
  Explore: Includes context parameter when invoking getExploreState() from Prometheus datasource (grafana#17569)
  Tests: Replaces truth image (grafana#17570)
  Fix: Fixes merge conflict (grafana#17568)
  Build: Fix failing e2e tests and implicit any check (grafana#17567)
  Explore: Fixes implicit any error in AdHocFilterField.test.tsx (grafana#17565)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jun 17, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into reuse-query2
8f6334c 
* grafana/master: (70 commits)
  AppPlugin: Fix load legacy plugin app (grafana#17574)
  Typescript: A batch of implicit any fixes (grafana#17590)
  RefreshPicker: Handle empty intervals (grafana#17585)
  Docker: Switch base to ubuntu:latest (grafana#17066)
  SQLStore: extend `user.SearchUsers` method (grafana#17514)
  Explore: Tag and Values for Influx are filtered by the selected measurement (grafana#17539)
  ldap: makes mocks available for testing. (grafana#17576)
  Devenv: Add nginx proxy for mac (grafana#17572)
  Graph: Added new fill gradient option (grafana#17528)
  Typescript: Reduce implicit any errors (grafana#17550)
  SinglestatPanel: Manages when getColorForValue() function returns null value. Closes grafana#9747 (grafana#17552)
  LDAP: refactoring  (grafana#17479)
  Elasticsearch: Fix empty query request to send properly (grafana#17488)
  SinglestatPanel: fix min/max config in singlestat sparklines (grafana#17543)
  AuthProxy: Optimistic lock pattern for remote cache Set (grafana#17485)
  Explore: Includes context parameter when invoking getExploreState() from Prometheus datasource (grafana#17569)
  Tests: Replaces truth image (grafana#17570)
  Fix: Fixes merge conflict (grafana#17568)
  Build: Fix failing e2e tests and implicit any check (grafana#17567)
  Explore: Fixes implicit any error in AdHocFilterField.test.tsx (grafana#17565)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jun 17, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into anno-panel
720a5ef 
* grafana/master: (75 commits)
  AppPlugin: Fix load legacy plugin app (grafana#17574)
  Typescript: A batch of implicit any fixes (grafana#17590)
  RefreshPicker: Handle empty intervals (grafana#17585)
  Docker: Switch base to ubuntu:latest (grafana#17066)
  SQLStore: extend `user.SearchUsers` method (grafana#17514)
  Explore: Tag and Values for Influx are filtered by the selected measurement (grafana#17539)
  ldap: makes mocks available for testing. (grafana#17576)
  Devenv: Add nginx proxy for mac (grafana#17572)
  Graph: Added new fill gradient option (grafana#17528)
  Typescript: Reduce implicit any errors (grafana#17550)
  SinglestatPanel: Manages when getColorForValue() function returns null value. Closes grafana#9747 (grafana#17552)
  LDAP: refactoring  (grafana#17479)
  Elasticsearch: Fix empty query request to send properly (grafana#17488)
  SinglestatPanel: fix min/max config in singlestat sparklines (grafana#17543)
  AuthProxy: Optimistic lock pattern for remote cache Set (grafana#17485)
  Explore: Includes context parameter when invoking getExploreState() from Prometheus datasource (grafana#17569)
  Tests: Replaces truth image (grafana#17570)
  Fix: Fixes merge conflict (grafana#17568)
  Build: Fix failing e2e tests and implicit any check (grafana#17567)
  Explore: Fixes implicit any error in AdHocFilterField.test.tsx (grafana#17565)
  ...
@papagian papagian mentioned this pull request Oct 31, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@torkelo torkelo torkelo approved these changes

Assignees
No one assigned
Labels
area/devenv developer environment related
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@aocenas @torkelo