7 Commits (9126bbbed0f136d5a2a48ba59cb9799456ceca40)

Author	SHA1	Message	Date
Julien	9126bbbed0	makefile: Add support for skipping UI build when prebuilt assets are provided ... This commit introduces the ability to skip the UI build in the Makefile by providing prebuilt UI assets, addressing the needs of users who may not have npm installed or who do not want to go through the front-end build process. To achieve this, we added the `PREBUILT_ASSETS_STATIC_DIR` environment variable. If this variable is set, the Makefile will skip the UI build and related tasks, such as bundling npm licenses. Instead, it will use the prebuilt assets from the specified directory. We already publish prebuilt UI assets as part of our release artifacts (e.g., `prometheus-web-ui-3.0.0-beta.0.tar.gz`). Users can download this tarball, extract it, and point the `PREBUILT_ASSETS_STATIC_DIR` to the extracted folder. This reduces build complexity, especially for users who don't have a development environment for front-end builds. For example, you can use the command: `make PREBUILT_ASSETS_STATIC_DIR=static build` where `static` refers to the directory containing the prebuilt UI files. This change simplifies the build process while still allowing users to use a prebuilt UI if desired. This solution is particularly useful for users who don't need to modify the UI and prefer to use the prebuilt version that we provide with each release. Signed-off-by: Julien <roidelapluie@o11y.eu>	3 months ago
Jan Fajerski	f29e0adb96	scripts: sort file list in embed directive ... Otherwise the resulting string depends on find, which afaict depends on the underlying filesystem. A stable file list make it easier to detect UI changes in downstreams that need to track UI assets. Signed-off-by: Jan Fajerski <jfajersk@redhat.com>	11 months ago
Matt	7541baff87	Make build script compatible with older gzip (#11256) ... * Add RHEL7 compatibility for gzip options Signed-off-by: Matthew Themis <matthew.themis@anatwine.com> Signed-off-by: Matt <33697686+mttradebyte@users.noreply.github.com> Co-authored-by: Julien Pivotto <roidelapluie@o11y.eu>	2 years ago
Julien Pivotto	c901ebaf8d	ui/compress: Do not change git worktree (#10467) ... This change makes sure that the git worktree is not changed while compressing assets, making it better for local development. To achieve this, the compression script keeps the un-compressed assets and generates the go:embed directory when compressing the files. A .gitignore file has been added to ignore generated files. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	3 years ago
Jan Fajerski	2c3d45c88a	Replace vfsgen with embed for static web assets (#10220) ... * remove vfsgen usages Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * web: use embed package for static assets This requires go 1.16. Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * circleci: drop go generate in web/ui Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * Makefile: compress web assets before build This commit add compression before (and decompression after) prometheus is build. This ensures that gzipped assets are embeded in the prometheus binary, if the builtinassets build tag is passed. If the build tag is not passed this step is still executed but has no effect. All this is executed in a subshell so that we can run the decompress step even if the build step fails, but retain the exit code of promu. This cleanup could also cover interrupts, but I left that out for now. Signed-off-by: Jan Fajerski <jfajersk@redhat.com>	3 years ago
Julien Pivotto	b48a1e9e9b	Revert "Replace vfsgen with embed for static web assets (#9719)" (#9870) ... This reverts commit ddaddc2a7a.	3 years ago
Jan Fajerski	ddaddc2a7a	Replace vfsgen with embed for static web assets (#9719) ... * remove vfsgen usages Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * web: use embed package for static assets This requires go 1.16. Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * circleci: drop go generate in web/ui Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * Makefile: compress web assets before build This commit add compression before (and decompression after) prometheus is build. This ensures that gzipped assets are embeded in the prometheus binary, if the builtinassets build tag is passed. If the build tag is not passed this step is still executed but has no effect. All this is executed in a subshell so that we can run the decompress step even if the build step fails, but retain the exit code of promu. This cleanup could also cover interrupts, but I left that out for now. Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * [FIXME]: add new module dependency on common/assets and temp replace Signed-off-by: Jan Fajerski <jfajersk@redhat.com>	3 years ago