Skip to content

Commit

Permalink
Release version 0.2.2-1
Browse files Browse the repository at this point in the history
  • Loading branch information
@carlosabalde
carlosabalde committed Jan 24, 2025
1 parent da6f3f3 commit 93d001a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 178 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- ?
- 0.2.2-1 (2025-01-24):
+ Added event handlers to apply the time range when 'Enter' is pressed in one of the time range inputs.
+ Fixed overflow when processing bitmap metrics.

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SHELL := /bin/bash
ROOT := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
UMASK := 022

VERSION := 0.2.1
VERSION := 0.2.2
ITERATION := 1
REVISION := $(shell cd '$(ROOT)' && git rev-parse --short HEAD)
ENVIRONMENT ?= production
Expand Down
2 changes: 1 addition & 1 deletion assets/static/app.js
View file

Large diffs are not rendered by default.

176 changes: 1 addition & 175 deletions assets/templates/index.html.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,175 +1 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>varnishmon</title>
<link rel="icon" href="/images/favicon.ico" type="image/x-icon">
<script type="text/javascript">const varnishmon={{.Config}}</script>
<script defer src="/app.js"></script><link href="/styles.css" rel="stylesheet"></head>
<body class="d-flex flex-column min-vh-100">
<nav class="navbar navbar-expand-lg navbar-dark bg-dark sticky-top">
<div class="container-fluid">
<a class="navbar-brand" href="/">varnishmon</a>
<div class="d-flex ms-auto">
<div class="me-4 align-self-center">
<span class="navbar-text font-monospace text-white"><i class="fa-solid fa-computer"></i> {{.Hostname}}</span>
</div>

<div class="me-2">
<div class="input-group">
<span class="input-group-text"><i class="fas fa-calendar-alt"></i></span>
<input type="text" id="range-from" class="form-control" placeholder="from">
</div>
</div>
<div class="me-2 align-self-center text-light" id="range">
<i class="fa-solid fa-arrow-right"></i>
</div>
<div class="me-2">
<div class="input-group">
<span class="input-group-text"><i class="fas fa-calendar-alt"></i></span>
<input type="text" id="range-to" class="form-control" placeholder="to">
</div>
</div>
<div class="me-4 align-self-center align-self-end">
<button id="apply-time-range" class="btn btn-primary" title="Apply the selected time range">
<i class="fa-solid fa-play"></i>
</button>
</div>

<div class="me-2">
<select id="refresh-interval" class="form-select"></select>
</div>
<div class="align-self-center align-self-end">
<button id="refresh" class="btn btn-primary" title="Trigger refresh now">
<i class="fa-solid fa-sync"></i>
</button>
</div>
</div>
</div>
</nav>

<main class="flex-grow-1">
<div class="container-fluid py-md-4">
<div class="row mb-2">
<div class="col-md-8">
<label for="filter" class="form-label">Filter</label>
<div class="input-group">
<span class="input-group-text"><i class="fa-solid fa-magnifying-glass"></i></span>
<input type="text" id="filter" class="form-control" placeholder="type here to filter metrics by name">
</div>
</div>
<div class="col-md-1">
<label for="verbosity" class="form-label">Verbosity</label>
<div class="input-group">
<span class="input-group-text"><i class="fa-regular fa-comments"></i></span>
<select id="verbosity" class="form-select"></select>
</div>
</div>
<div class="col-md-1">
<label for="columns" class="form-label">Columns</label>
<div class="input-group">
<span class="input-group-text"><i class="fa-solid fa-table-cells-large"></i></span>
<select id="columns" class="form-select"></select>
</div>
</div>
<div class="col-md-1">
<label for="aggregator" class="form-label">Aggregator</label>
<div class="input-group">
<span class="input-group-text"><i class="fa-solid fa-filter"></i></span>
<select id="aggregator" class="form-select"></select>
</div>
</div>
<div class="col-md-1">
<label for="step" class="form-label">Step</label>
<div class="input-group">
<span class="input-group-text"><i class="fa-solid fa-arrows-left-right-to-line"></i></span>
<input type="number" id="step" class="form-control">
</div>
</div>
</div>

<div class="row mb-2">
<div class="col align-content-center text-muted" id="filter-stats"></div>
<div class="col text-end">
<a class="btn btn-link" href="/metrics" role="button" title="View internal Prometheus metrics">internal metrics</a> |
<button type="button" id="reset" class="btn btn-link" title="Discard saved state & reload">reset</button> |
<button type="button" id="collapse-all" class="btn btn-link" title="Collapse all clusters">collapse</button> |
<button type="button" id="expand-all" class="btn btn-link" title="Expand all clusters">expand</button>
</div>
</div>

<div id="clusters" class="accordion accordion-flush">
<div class="d-flex justify-content-center">
<div class="spinner-border fs-2 opacity-50" role="status">
<span class="visually-hidden">Loading...</span>
</div>
</div>
</div>
</div>
</main>

<footer class="text-center mt-4">
<i class="fa-solid fa-bolt"></i> Powered by <a href="https://github.com/allenta/varnishmon/">varnishmon</a>
v{{.Version}} (<span class="font-monospace">{{.Revision}}</span>)
</footer>

<div id="notifications" class="position-fixed bottom-0 end-0 p-3 d-grid gap-2">
</div>

<!-- Template elements -->

<template id="spinner-template">
<div class="d-flex justify-content-center">
<div class="spinner-border fs-2 opacity-50" role="status">
<span class="visually-hidden">Loading...</span>
</div>
</div>
</template>

<template id="metrics-meditation-template">
<div class="d-flex flex-column text-center justify-content-center">
<h2 class="mt-4"><i class="fa-regular fa-face-sad-tear fa-3x"></i></h2>
<h2 class="mt-2">Metrics Meditation</h2>
<p class="mt-4 text-muted fs-5 w-25 mx-auto">Oops! Something went wrong while fetching metrics. Please, make sure
<span class="font-monospace">varnishmon</span> is up and reachable</p>
</div>
</template>

<template id="cluster-template">
<div class="cluster accordion-item">
<div class="accordion-header">
<button class="cluster-name accordion-button bg-light text-dark fs-5 border-0" type="button">
</button>
</div>
<div class="accordion-collapse">
<div class="charts row g-4 py-4">
</div>
</div>
</div>
</template>

<template id="chart-template">
<div class="chart col">
<div class="card position-relative">
<span class="error-icon text-danger position-absolute top-0 end-0 m-2 z-1 d-none">
<i class="fas fa-exclamation-circle"></i>
</span>
<div class="card-body">
<div class="graph" style="height: 300px;">
</div>
</div>
</div>
</div>
</template>

<template id="notification-template">
<div class="toast align-items-center border-0" role="alert" aria-live="assertive" aria-atomic="true">
<div class="d-flex">
<div class="toast-body"></div>
<button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
</div>
</div>
</template>
</body>
</html>
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>varnishmon</title><link rel="icon" href="/images/favicon.ico" type="image/x-icon"><script>const varnishmon={{.Config}}</script><script defer="defer" src="/app.js"></script><link href="/styles.css" rel="stylesheet"></head><body class="d-flex flex-column min-vh-100"><nav class="navbar navbar-expand-lg navbar-dark bg-dark sticky-top"><div class="container-fluid"><a class="navbar-brand" href="/">varnishmon</a><div class="d-flex ms-auto"><div class="me-4 align-self-center"><span class="navbar-text font-monospace text-white"><i class="fa-solid fa-computer"></i> {{.Hostname}}</span></div><div class="me-2"><div class="input-group"><span class="input-group-text"><i class="fas fa-calendar-alt"></i></span> <input id="range-from" class="form-control" placeholder="from"></div></div><div class="me-2 align-self-center text-light" id="range"><i class="fa-solid fa-arrow-right"></i></div><div class="me-2"><div class="input-group"><span class="input-group-text"><i class="fas fa-calendar-alt"></i></span> <input id="range-to" class="form-control" placeholder="to"></div></div><div class="me-4 align-self-center align-self-end"><button id="apply-time-range" class="btn btn-primary" title="Apply the selected time range"><i class="fa-solid fa-play"></i></button></div><div class="me-2"><select id="refresh-interval" class="form-select"></select></div><div class="align-self-center align-self-end"><button id="refresh" class="btn btn-primary" title="Trigger refresh now"><i class="fa-solid fa-sync"></i></button></div></div></div></nav><main class="flex-grow-1"><div class="container-fluid py-md-4"><div class="row mb-2"><div class="col-md-8"><label for="filter" class="form-label">Filter</label><div class="input-group"><span class="input-group-text"><i class="fa-solid fa-magnifying-glass"></i></span> <input id="filter" class="form-control" placeholder="type here to filter metrics by name"></div></div><div class="col-md-1"><label for="verbosity" class="form-label">Verbosity</label><div class="input-group"><span class="input-group-text"><i class="fa-regular fa-comments"></i></span> <select id="verbosity" class="form-select"></select></div></div><div class="col-md-1"><label for="columns" class="form-label">Columns</label><div class="input-group"><span class="input-group-text"><i class="fa-solid fa-table-cells-large"></i></span> <select id="columns" class="form-select"></select></div></div><div class="col-md-1"><label for="aggregator" class="form-label">Aggregator</label><div class="input-group"><span class="input-group-text"><i class="fa-solid fa-filter"></i></span> <select id="aggregator" class="form-select"></select></div></div><div class="col-md-1"><label for="step" class="form-label">Step</label><div class="input-group"><span class="input-group-text"><i class="fa-solid fa-arrows-left-right-to-line"></i></span> <input type="number" id="step" class="form-control"></div></div></div><div class="row mb-2"><div class="col align-content-center text-muted" id="filter-stats"></div><div class="col text-end"><a class="btn btn-link" href="/metrics" role="button" title="View internal Prometheus metrics">internal metrics</a> | <button type="button" id="reset" class="btn btn-link" title="Discard saved state & reload">reset</button> | <button type="button" id="collapse-all" class="btn btn-link" title="Collapse all clusters">collapse</button> | <button type="button" id="expand-all" class="btn btn-link" title="Expand all clusters">expand</button></div></div><div id="clusters" class="accordion accordion-flush"><div class="d-flex justify-content-center"><div class="spinner-border fs-2 opacity-50" role="status"><span class="visually-hidden">Loading...</span></div></div></div></div></main><footer class="text-center mt-4"><i class="fa-solid fa-bolt"></i> Powered by <a href="https://github.com/allenta/varnishmon/">varnishmon</a> v{{.Version}} (<span class="font-monospace">{{.Revision}}</span>)</footer><div id="notifications" class="position-fixed bottom-0 end-0 p-3 d-grid gap-2"></div><template id="spinner-template"><div class="d-flex justify-content-center"><div class="spinner-border fs-2 opacity-50" role="status"><span class="visually-hidden">Loading...</span></div></div></template><template id="metrics-meditation-template"><div class="d-flex flex-column text-center justify-content-center"><h2 class="mt-4"><i class="fa-regular fa-face-sad-tear fa-3x"></i></h2><h2 class="mt-2">Metrics Meditation</h2><p class="mt-4 text-muted fs-5 w-25 mx-auto">Oops! Something went wrong while fetching metrics. Please, make sure <span class="font-monospace">varnishmon</span> is up and reachable</p></div></template><template id="cluster-template"><div class="cluster accordion-item"><div class="accordion-header"><button class="cluster-name accordion-button bg-light text-dark fs-5 border-0" type="button"></button></div><div class="accordion-collapse"><div class="charts row g-4 py-4"></div></div></div></template><template id="chart-template"><div class="chart col"><div class="card position-relative"><span class="error-icon text-danger position-absolute top-0 end-0 m-2 z-1 d-none"><i class="fas fa-exclamation-circle"></i></span><div class="card-body"><div class="graph" style="height:300px"></div></div></div></div></template><template id="notification-template"><div class="toast align-items-center border-0" role="alert" aria-live="assertive" aria-atomic="true"><div class="d-flex"><div class="toast-body"></div><button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button></div></div></template></body></html>

0 comments on commit 93d001a

Please sign in to comment.