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 Tools: Update Prometheus and Grafana #1857

Merged
merged 2 commits into from
Oct 21, 2020
Merged

Build Tools: Update Prometheus and Grafana #1857

merged 2 commits into from
Oct 21, 2020

Conversation

markmandel
Copy link
Collaborator

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespace from that line:

/kind breaking
/kind bug

/kind cleanup

/kind documentation
/kind feature
/kind hotfix

What this PR does / Why we need it:

Updated the install instructions for our dev tooling to match PR #1850

Which issue(s) this PR fixes:

Related to #1850

Special notes for your reviewer:

N/A

@markmandel markmandel added kind/cleanup Refactoring code, fixing up documentation, etc area/build-tools Development tooling. I.e. pretty much everything in the `build` directory. labels Oct 20, 2020
@google-cla google-cla bot added the cla: yes label Oct 20, 2020
roberthbailey
roberthbailey reviewed Oct 20, 2020
View reviewed changes
Copy link
Member

@roberthbailey roberthbailey left a comment

Choose a reason for hiding this comment

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

Just some minor formatting nits.

build/Makefile Outdated
$(DOCKER_RUN) helm repo update
$(DOCKER_RUN) helm upgrade prom stable/prometheus \
--install --wait --namespace metrics --create-namespace \
$(DOCKER_RUN) helm upgrade --install --wait prom prometheus-community/prometheus --version 11.16.2 \
Copy link
Member

Choose a reason for hiding this comment

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

Was there a reason you moved the --install and --wait flags before the name of the chart? Now there are some flags before the name and some after, which is odd (same question below as well).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

No real reason, was just copy pasting the referenced PR. I can switch it around.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed!

build/Makefile Outdated
--set persistence.enabled=$(PVC),server.persistentVolume.size=$(PV_SIZE) \
--set adminPassword=$(PASSWORD) -f $(mount_path)/build/grafana.yaml
$(DOCKER_RUN) helm upgrade --install --wait grafana grafana/grafana --version=5.7.10 \
--namespace metrics --create-namespace \
Copy link
Member

Choose a reason for hiding this comment

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

The indentation here seems off (and not consistent with how it's done for the prometheus command above).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed!

@markmandel
Build Tools: Update Prometheus and Grafana
62387de 
Updated the install instructions for our dev tooling to match PR googleforgames#1850
@markmandel markmandel force-pushed the dev/updated-graf-prom branch from 2726954 to 62387de Compare October 20, 2020 21:35
@agones-bot
Copy link
Collaborator

Build Succeeded 👏

Build Id: 212a8d53-a23e-4e66-a29b-cfaf4576d8c5

The following development artifacts have been built, and will exist for the next 30 days:

A preview of the website (the last 30 builds are retained):

To install this version:

  • git fetch https://github.com/googleforgames/agones.git pull/1857/head:pr_1857 && git checkout pr_1857
  • helm install ./install/helm/agones --namespace agones-system --name agones --set agones.image.tag=1.10.0-62387de

@google-oss-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: markmandel, roberthbailey

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [markmandel,roberthbailey]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@google-oss-robot
Copy link

New changes are detected. LGTM label has been removed.

@agones-bot
Copy link
Collaborator

Build Succeeded 👏

Build Id: fe33dad7-4d05-47a4-a97b-f463bcc9f940

The following development artifacts have been built, and will exist for the next 30 days:

A preview of the website (the last 30 builds are retained):

To install this version:

  • git fetch https://github.com/googleforgames/agones.git pull/1857/head:pr_1857 && git checkout pr_1857
  • helm install ./install/helm/agones --namespace agones-system --name agones --set agones.image.tag=1.10.0-0917d40

@roberthbailey roberthbailey merged commit 8872716 into googleforgames:master Oct 21, 2020
@markmandel markmandel deleted the dev/updated-graf-prom branch October 21, 2020 14:45
@markmandel markmandel added this to the 1.10.0 milestone Oct 21, 2020
ilkercelikyilmaz pushed a commit to ilkercelikyilmaz/agones that referenced this pull request Oct 23, 2020
@markmandel @roberthbailey @ilkercelikyilmaz
Build Tools: Update Prometheus and Grafana (googleforgames#1857)
6ad4026 
Updated the install instructions for our dev tooling to match PR googleforgames#1850

Co-authored-by: Robert Bailey <robertbailey@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roberthbailey roberthbailey roberthbailey approved these changes

@pooneh-m pooneh-m Awaiting requested review from pooneh-m

@EricFortin EricFortin Awaiting requested review from EricFortin

Assignees

@roberthbailey roberthbailey

Labels
approved area/build-tools Development tooling. I.e. pretty much everything in the `build` directory. cla: yes kind/cleanup Refactoring code, fixing up documentation, etc size/S
Projects
None yet
Milestone
1.10.0
Development

Successfully merging this pull request may close these issues.
4 participants
@markmandel @agones-bot @google-oss-robot @roberthbailey