Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Serve Prometheus metrics on a separate port; fix metrics development workflow #2093

Merged
merged 2 commits into from
Feb 8, 2023

Conversation

sarayourfriend
Copy link
Contributor

Description

Prometheus metrics generally should not be served on a public endpoint. The easiest way to make the metrics publicly inaccessible is to serve them on an entirely separate port. This allows us to easily make security group changes that only allow services internal to our VPC (specifically, Grafana Agent) to access the metrics endpoints.

In the process, I also went ahead and fixed some issues with the Prometheus development workflow, namely that its metrics were disabled by default in development due to a persistent crash when the server automatically restarts after changes. To fix this, we just need to de-register all the existing metrics when the server closes. This allows the express-prom-bundle middleware to re-register the same metrics without causing name clashes with the metrics registered during the initial start up.

Testing Instructions

Checkout the branch and run the app locally using just run dev. Run the prod version as well with just run prod. Confirm that in both cases, metrics are only accessible at localhost:54641 and no longer at localhost:8443/metrics.

Checklist

  • My pull request has a descriptive title (not a vague title like
    Update index.md).
  • My pull request targets the default branch of the repository (main) or
    a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • [N/A] I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible
    errors.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@sarayourfriend sarayourfriend added 🟩 priority: low Low priority and doesn't need to be rushed 💻 aspect: code Concerns the software code in the repository 🧰 goal: internal improvement Improvement that benefits maintainers, not users labels Jan 11, 2023
@sarayourfriend sarayourfriend requested a review from a team as a code owner January 11, 2023 03:21
@github-actions
Copy link

github-actions bot commented Jan 11, 2023

Storybook and Tailwind configuration previews: Ready

Storybook: https://wordpress.github.io/openverse-frontend/_preview/2093
Tailwind: https://wordpress.github.io/openverse-frontend/_preview/2093/tailwind

Please note that GitHub pages takes a little time to deploy newly pushed code, if the links above don't work or you see old versions, wait 5 minutes and try again.

You can check the GitHub pages deployment action list to see the current status of the deployments.

@github-actions
Copy link

Size Change: -286 B (0%)

Total Size: 896 kB

Filename Size Change
./.nuxt/dist/client/236.js 1.85 kB +1.58 kB (+581%) 🆘
./.nuxt/dist/client/236.modern.js 0 B -277 B (removed) 🏆
./.nuxt/dist/client/237.js 0 B -1.85 kB (removed) 🏆
./.nuxt/dist/client/app.js 148 kB -137 B (0%)
./.nuxt/dist/client/app.modern.js 122 kB -138 B (0%)
./.nuxt/dist/client/235.js 272 B +272 B (new file) 🆕
./.nuxt/dist/client/235.modern.js 277 B +277 B (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./.nuxt/dist/client/commons/app.js 86.7 kB 0 B
./.nuxt/dist/client/commons/app.modern.js 77.4 kB 0 B
./.nuxt/dist/client/components/loading-icon.js 747 B 0 B
./.nuxt/dist/client/components/loading-icon.modern.js 748 B 0 B
./.nuxt/dist/client/components/table-sort-icon.js 508 B 0 B
./.nuxt/dist/client/components/table-sort-icon.modern.js 513 B 0 B
./.nuxt/dist/client/components/v-all-results-grid.js 7.49 kB 0 B
./.nuxt/dist/client/components/v-all-results-grid.modern.js 5.01 kB 0 B
./.nuxt/dist/client/components/v-audio-cell.js 357 B 0 B
./.nuxt/dist/client/components/v-audio-cell.modern.js 361 B 0 B
./.nuxt/dist/client/components/v-audio-details.js 2.53 kB 0 B
./.nuxt/dist/client/components/v-audio-details.modern.js 1.78 kB 0 B
./.nuxt/dist/client/components/v-audio-track-skeleton.js 1.01 kB 0 B
./.nuxt/dist/client/components/v-audio-track-skeleton.modern.js 1.02 kB 0 B
./.nuxt/dist/client/components/v-audio-track.js 5.19 kB 0 B
./.nuxt/dist/client/components/v-audio-track.modern.js 5.14 kB 0 B
./.nuxt/dist/client/components/v-back-to-search-results-link.js 537 B 0 B
./.nuxt/dist/client/components/v-back-to-search-results-link.modern.js 543 B 0 B
./.nuxt/dist/client/components/v-bone.js 684 B 0 B
./.nuxt/dist/client/components/v-bone.modern.js 687 B 0 B
./.nuxt/dist/client/components/v-box-layout.js 1.21 kB 0 B
./.nuxt/dist/client/components/v-box-layout.modern.js 1.2 kB 0 B
./.nuxt/dist/client/components/v-content-link.js 1.11 kB 0 B
./.nuxt/dist/client/components/v-content-link.modern.js 1.09 kB 0 B
./.nuxt/dist/client/components/v-content-page.js 467 B 0 B
./.nuxt/dist/client/components/v-content-page.modern.js 471 B 0 B
./.nuxt/dist/client/components/v-content-report-button.js 778 B 0 B
./.nuxt/dist/client/components/v-content-report-button.modern.js 779 B 0 B
./.nuxt/dist/client/components/v-content-report-form.js 6.08 kB 0 B
./.nuxt/dist/client/components/v-content-report-form.modern.js 3.57 kB 0 B
./.nuxt/dist/client/components/v-content-report-popover.js 1.22 kB 0 B
./.nuxt/dist/client/components/v-content-report-popover.modern.js 4.22 kB 0 B
./.nuxt/dist/client/components/v-copy-button.js 3.99 kB 0 B
./.nuxt/dist/client/components/v-copy-button.modern.js 3.99 kB 0 B
./.nuxt/dist/client/components/v-copy-license.js 1 kB 0 B
./.nuxt/dist/client/components/v-copy-license.modern.js 1 kB 0 B
./.nuxt/dist/client/components/v-copy-license/components/v-error-image/components/v-media-reuse/components/v-search-grid/09090664.js 9.87 kB 0 B
./.nuxt/dist/client/components/v-copy-license/components/v-error-image/components/v-media-reuse/components/v-search-grid/09090664.modern.js 9.84 kB 0 B
./.nuxt/dist/client/components/v-dmca-notice.js 749 B 0 B
./.nuxt/dist/client/components/v-dmca-notice.modern.js 751 B 0 B
./.nuxt/dist/client/components/v-error-image.js 1.7 kB 0 B
./.nuxt/dist/client/components/v-error-image.modern.js 1.68 kB 0 B
./.nuxt/dist/client/components/v-error-section.js 372 B 0 B
./.nuxt/dist/client/components/v-error-section.modern.js 375 B 0 B
./.nuxt/dist/client/components/v-external-search-form.js 3.09 kB 0 B
./.nuxt/dist/client/components/v-external-search-form.modern.js 3.06 kB 0 B
./.nuxt/dist/client/components/v-external-source-list.js 2.55 kB 0 B
./.nuxt/dist/client/components/v-external-source-list.modern.js 2.52 kB 0 B
./.nuxt/dist/client/components/v-full-layout.js 1.59 kB 0 B
./.nuxt/dist/client/components/v-full-layout.modern.js 1.59 kB 0 B
./.nuxt/dist/client/components/v-grid-skeleton.js 1.61 kB 0 B
./.nuxt/dist/client/components/v-grid-skeleton.modern.js 1.62 kB 0 B
./.nuxt/dist/client/components/v-home-gallery.js 4.8 kB 0 B
./.nuxt/dist/client/components/v-home-gallery.modern.js 4.79 kB 0 B
./.nuxt/dist/client/components/v-homepage-content.js 820 B 0 B
./.nuxt/dist/client/components/v-homepage-content.modern.js 823 B 0 B
./.nuxt/dist/client/components/v-image-carousel.js 4.76 kB 0 B
./.nuxt/dist/client/components/v-image-carousel.modern.js 4.74 kB 0 B
./.nuxt/dist/client/components/v-image-cell-square.js 993 B 0 B
./.nuxt/dist/client/components/v-image-cell-square.modern.js 997 B 0 B
./.nuxt/dist/client/components/v-image-cell.js 1.43 kB 0 B
./.nuxt/dist/client/components/v-image-cell.modern.js 1.42 kB 0 B
./.nuxt/dist/client/components/v-image-details.js 2.14 kB 0 B
./.nuxt/dist/client/components/v-image-details.modern.js 1.42 kB 0 B
./.nuxt/dist/client/components/v-image-grid.js 4.88 kB 0 B
./.nuxt/dist/client/components/v-image-grid.modern.js 2.42 kB 0 B
./.nuxt/dist/client/components/v-license-tab-panel.js 521 B 0 B
./.nuxt/dist/client/components/v-license-tab-panel.modern.js 525 B 0 B
./.nuxt/dist/client/components/v-load-more.js 3.16 kB 0 B
./.nuxt/dist/client/components/v-load-more.modern.js 683 B 0 B
./.nuxt/dist/client/components/v-media-license.js 819 B 0 B
./.nuxt/dist/client/components/v-media-license.modern.js 828 B 0 B
./.nuxt/dist/client/components/v-media-reuse.js 1.62 kB 0 B
./.nuxt/dist/client/components/v-media-reuse.modern.js 1.61 kB 0 B
./.nuxt/dist/client/components/v-media-tag.js 428 B 0 B
./.nuxt/dist/client/components/v-media-tag.modern.js 433 B 0 B
./.nuxt/dist/client/components/v-no-results.js 2.75 kB 0 B
./.nuxt/dist/client/components/v-no-results.modern.js 2.72 kB 0 B
./.nuxt/dist/client/components/v-old-homepage-content.js 1.88 kB 0 B
./.nuxt/dist/client/components/v-old-homepage-content.modern.js 1.85 kB 0 B
./.nuxt/dist/client/components/v-radio.js 1.51 kB 0 B
./.nuxt/dist/client/components/v-radio.modern.js 1.47 kB 0 B
./.nuxt/dist/client/components/v-related-audio.js 1.25 kB 0 B
./.nuxt/dist/client/components/v-related-audio.modern.js 1.25 kB 0 B
./.nuxt/dist/client/components/v-related-images.js 1.05 kB 0 B
./.nuxt/dist/client/components/v-related-images.modern.js 2.98 kB 0 B
./.nuxt/dist/client/components/v-report-desc-form.js 965 B 0 B
./.nuxt/dist/client/components/v-report-desc-form.modern.js 969 B 0 B
./.nuxt/dist/client/components/v-row-layout.js 1.7 kB 0 B
./.nuxt/dist/client/components/v-row-layout.modern.js 1.71 kB 0 B
./.nuxt/dist/client/components/v-scroll-button.js 813 B 0 B
./.nuxt/dist/client/components/v-scroll-button.modern.js 819 B 0 B
./.nuxt/dist/client/components/v-search-grid.js 5.43 kB 0 B
./.nuxt/dist/client/components/v-search-grid.modern.js 5.38 kB 0 B
./.nuxt/dist/client/components/v-search-results-title.js 656 B 0 B
./.nuxt/dist/client/components/v-search-results-title.modern.js 655 B 0 B
./.nuxt/dist/client/components/v-search-type-radio.js 792 B 0 B
./.nuxt/dist/client/components/v-search-type-radio.modern.js 768 B 0 B
./.nuxt/dist/client/components/v-server-timeout.js 299 B 0 B
./.nuxt/dist/client/components/v-server-timeout.modern.js 303 B 0 B
./.nuxt/dist/client/components/v-sketch-fab-viewer.js 3.37 kB 0 B
./.nuxt/dist/client/components/v-sketch-fab-viewer.modern.js 895 B 0 B
./.nuxt/dist/client/components/v-skip-to-content-container.js 888 B 0 B
./.nuxt/dist/client/components/v-skip-to-content-container.modern.js 894 B 0 B
./.nuxt/dist/client/components/v-snackbar.js 1.18 kB 0 B
./.nuxt/dist/client/components/v-snackbar.modern.js 1.19 kB 0 B
./.nuxt/dist/client/components/v-sources-table.js 16.5 kB 0 B
./.nuxt/dist/client/components/v-sources-table.modern.js 16.6 kB 0 B
./.nuxt/dist/client/components/v-warning-suppressor.js 299 B 0 B
./.nuxt/dist/client/components/v-warning-suppressor.modern.js 302 B 0 B
./.nuxt/dist/client/pages/about.js 1.51 kB 0 B
./.nuxt/dist/client/pages/about.modern.js 1.51 kB 0 B
./.nuxt/dist/client/pages/audio/_id.js 7.96 kB +1 B (0%)
./.nuxt/dist/client/pages/audio/_id.modern.js 4.79 kB 0 B
./.nuxt/dist/client/pages/external-sources.js 1.53 kB 0 B
./.nuxt/dist/client/pages/external-sources.modern.js 1.53 kB 0 B
./.nuxt/dist/client/pages/feedback.js 1.31 kB +1 B (0%)
./.nuxt/dist/client/pages/feedback.modern.js 1.31 kB +1 B (0%)
./.nuxt/dist/client/pages/image/_id.js 9.25 kB 0 B
./.nuxt/dist/client/pages/image/_id.modern.js 7.33 kB +1 B (0%)
./.nuxt/dist/client/pages/index.js 7.97 kB -2 B (0%)
./.nuxt/dist/client/pages/index.modern.js 7.86 kB -2 B (0%)
./.nuxt/dist/client/pages/preferences.js 1.22 kB 0 B
./.nuxt/dist/client/pages/preferences.modern.js 1.21 kB +1 B (0%)
./.nuxt/dist/client/pages/privacy.js 983 B 0 B
./.nuxt/dist/client/pages/privacy.modern.js 984 B 0 B
./.nuxt/dist/client/pages/search-help.js 1.61 kB 0 B
./.nuxt/dist/client/pages/search-help.modern.js 1.61 kB 0 B
./.nuxt/dist/client/pages/search.js 5.09 kB +1 B (0%)
./.nuxt/dist/client/pages/search.modern.js 2.6 kB 0 B
./.nuxt/dist/client/pages/search/audio.js 6.14 kB -2 B (0%)
./.nuxt/dist/client/pages/search/audio.modern.js 3.65 kB 0 B
./.nuxt/dist/client/pages/search/image.js 661 B 0 B
./.nuxt/dist/client/pages/search/image.modern.js 2.73 kB 0 B
./.nuxt/dist/client/pages/search/index.js 543 B +1 B (0%)
./.nuxt/dist/client/pages/search/index.modern.js 548 B 0 B
./.nuxt/dist/client/pages/search/model-3d.js 243 B 0 B
./.nuxt/dist/client/pages/search/model-3d.modern.js 246 B 0 B
./.nuxt/dist/client/pages/search/search-page.types.js 266 B 0 B
./.nuxt/dist/client/pages/search/search-page.types.modern.js 271 B 0 B
./.nuxt/dist/client/pages/search/video.js 240 B 0 B
./.nuxt/dist/client/pages/search/video.modern.js 244 B 0 B
./.nuxt/dist/client/pages/sources.js 1.55 kB 0 B
./.nuxt/dist/client/pages/sources.modern.js 1.54 kB 0 B
./.nuxt/dist/client/runtime.js 2.73 kB -6 B (0%)
./.nuxt/dist/client/runtime.modern.js 2.73 kB -5 B (0%)
./.nuxt/dist/client/vendors/app.js 63.7 kB 0 B
./.nuxt/dist/client/vendors/app.modern.js 63.1 kB 0 B

compressed-size-action

Copy link
Contributor

@obulat obulat left a comment

Choose a reason for hiding this comment

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

I ran this PR both in dev and in prod, and it works as expected.
My only (non-blocking) suggestion is to extract Prometheus code into a separate module. I tried doing that in #2109. I think this will make the transition to Nuxt 3 a little bit easier, and the nuxt config file cleaner.

@openverse-bot
Copy link
Contributor

Based on the low urgency of this PR, the following reviewers are being gently reminded to review this PR:

@zackkrida
@dhruvkb
This reminder is being automatically generated due to the urgency configuration.

Excluding weekend1 days, this PR was updated 5 day(s) ago. PRs labelled with low urgency are expected to be reviewed within 5 weekday(s)2.

@sarayourfriend, if this PR is not ready for a review, please draft it to prevent reviewers from getting further unnecessary pings.

Footnotes

  1. Specifically, Saturday and Sunday.

  2. For the purpose of these reminders we treat Monday - Friday as weekdays. Please note that the that generates these reminders runs at midnight UTC on Monday - Friday. This means that depending on your timezone, you may be pinged outside of the expected range.

Copy link
Member

@dhruvkb dhruvkb left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the inline docs, they're helpful.

@sarayourfriend sarayourfriend merged commit 93abbab into main Feb 8, 2023
@sarayourfriend sarayourfriend deleted the add/separate-metrics-port branch February 8, 2023 04:41
github-actions bot pushed a commit that referenced this pull request Feb 8, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
💻 aspect: code Concerns the software code in the repository 🧰 goal: internal improvement Improvement that benefits maintainers, not users 🟩 priority: low Low priority and doesn't need to be rushed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants