mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-14 01:24:04 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
1279 commits 247 branches 438 tags 656 MiB
Commit graph

195 commits

Author SHA1 Message Date
Bjoern Rabenstein 7e5745fe0e Slim down the files we embed into the binary. 
- Use only the minified versions of bootstrap.

- Do not embed non-minified bootstrap files and bootstrap map files.

- Simplify the 'blob-stamp' Makefile contraption.
 2015-01-26 15:10:27 +01:00
Julius Volz d4374a9265 More efficient JSON query result format. 
This depends on https://github.com/prometheus/client_golang/pull/51.

For vectors, the result format looks like this:

```json
{
   "version": 1,
   "type" : "vector",
   "value" : [
      {
         "timestamp" : 1421765411.045,
         "value" : "65.475000",
         "metric" : {
            "quantile" : "0.5",
            "instance" : "http://localhost:9090/metrics",
            "job" : "prometheus",
            "__name__" : "http_request_duration_microseconds",
            "handler" : "/static/",
            "method" : "get",
            "code" : "304"
         }
      },
      {
         "timestamp" : 1421765411.045,
         "value" : "5826.339000",
         "metric" : {
            "quantile" : "0.9",
            "instance" : "http://localhost:9090/metrics",
            "job" : "prometheus",
            "__name__" : "http_request_duration_microseconds",
            "handler" : "prometheus",
            "method" : "get",
            "code" : "200"
         }
      },
      /* ... */
   ]
}
```

For matrices, it looks like this:

```json
{
   "version": 1,
   "type" : "matrix",
   "value" : [
      {
         "metric" : {
            "quantile" : "0.99",
            "instance" : "http://localhost:9090/metrics",
            "job" : "prometheus",
            "__name__" : "http_request_duration_microseconds",
            "handler" : "/static/",
            "method" : "get",
            "code" : "200"
         },
         "values" : [
            [
               1421765547.659,
               "29162.953000"
            ],
            [
               1421765548.659,
               "29162.953000"
            ],
            [
               1421765549.659,
               "29162.953000"
            ],
            /* ... */
         ]
      }
   ]
}
```
 2015-01-26 13:06:22 +01:00
Brian Brazil 2b07cd3875 Keep total counter outside out loop. 
This was causing only the last expression to be graphed.
 2015-01-26 10:51:38 +00:00
juliusv 351a1eb96b Merge pull request #457 from brian-brazil/bootstrap3 
Adjust for bootstrap3. Remove long lists from LHS menu.
 2015-01-22 15:24:58 +01:00
Brian Brazil 2d8bfa0ced Adjust for bootstrap3. Remove long lists from LHS menu. 
Put in a table on the node page instead.
 2015-01-22 14:23:22 +00:00
Björn Rabenstein edc91cbabb Merge pull request #456 from prometheus/beorn7/license-cleanup 
Clean up license issues.
 2015-01-22 14:32:37 +01:00
Stuart Nelson 8ada6360ef Add floats to align inputs, and clear the float on the parent. 2015-01-22 13:27:35 +01:00
Bjoern Rabenstein 5859b74f1b Clean up license issues. 
- Move CONTRIBUTORS.md to the more common AUTHORS.
- Added the required NOTICE file.
- Changed "Prometheus Team" to "The Prometheus Authors".
- Reverted the erroneous changes to the Apache License.
 2015-01-21 20:07:45 +01:00
Julius Volz 4133020de1 Align graph controls with graph edge. 2015-01-20 16:43:23 +01:00
Julius Volz 12a99ab5b4 Some more UI/JS fixes/cleanups. 2015-01-19 14:27:07 +01:00
Julius Volz 013c22ca01 Adjust input group margins for more equal spacing. 2015-01-19 14:15:37 +01:00
Julius Volz 170da9460d Focus/typeahead fix. 2015-01-19 13:33:56 +01:00
Julius Volz d96d4933d9 Complete Bootstrap 3 conversion. 
- use the autocomplete plugin from
  https://github.com/bassjobsen/Bootstrap-3-Typeahead
- use native Bootstrap tabs
- make everything look much nicer (hopefully)
- other minor fixes/additions
 2015-01-19 01:29:30 +01:00
Julius Volz ff5eeb49fa Fix datepicker timezone issues. 2015-01-14 15:09:58 +01:00
Stuart Nelson 97ad5d3d1b Update jquery and jquery-ui. 2015-01-12 16:37:25 +01:00
Stuart Nelson 5cd8030c37 Include bootstrap.js.min 2015-01-12 16:37:13 +01:00
Stuart Nelson 8d7581d8c4 Add datetimepicker css. 2015-01-12 14:26:09 +01:00
Stuart Nelson 0529e3fcfa Use datetimepicker. 2015-01-12 14:18:28 +01:00
Stuart Nelson 2d5c2c5726 style rickshaw legend 2015-01-09 14:27:58 +01:00
Stuart Nelson 3814daac48 Make Loadtime/ Resolution info look nicer. 2015-01-09 14:23:09 +01:00
Stuart Nelson 071d98f3d0 Square corners 2015-01-09 14:23:00 +01:00
Stuart Nelson 7b9bf8d3e5 Query header. 2015-01-09 14:12:52 +01:00
Stuart Nelson 46f7bd2820 graph controls 2015-01-09 13:55:01 +01:00
Julius Volz 8ce89f0086 WIP: Upgrade to Bootstrap 3. 2015-01-09 10:15:56 +01:00
Brian Brazil ffa2e73803 Fix regression from 5e8d57bec1 
0 is a false value, so shortcutting no longer works.
Update other places in the code that assumed graph was the default.
 2014-12-27 00:28:36 +00:00
Brian Brazil fd43daf82e Upgrade rickshaw to v1.5.1 
This includes better handling for missing data points in stacked graphs.
 2014-12-26 14:44:06 +00:00
Julius Volz cc27fb8aab Rename remaining all-caps constants in AST layer. 
Change-Id: Ibe97e30981969056ffcdb89e63c1468ea1ffa140
 2014-12-25 01:30:47 +01:00
juliusv 401decc847 Merge pull request #428 from brian-brazil/sample-consoles 
Console templating library, including graphs.
 2014-12-18 17:59:54 +01:00
Brian Brazil 43b105d32d Console templating library, including graphs. 
This provides the basic js, css and console template
templates required to build dashboards.
Included as an example are consoles for the node_exporter.

Change-Id: I4cfeea5e9691a9413f74ae98ca32a908df8e4a59
 2014-12-18 16:54:31 +00:00
Johannes 'fish' Ziemke ff95a52b0f Rename Address to URL 
The "Address" is actually a URL which may contain username and
password. Calling this Address is misleading so we rename it.

Change-Id: I441c7ab9dfa2ceedc67cde7a47e6843a65f60511
 2014-12-18 12:18:16 +01:00
Bjoern Rabenstein 39efe6358b Fix typos and import order. 
This doesn't make the import order consistend everywhere, just where
it was touched by the previous commit.

Change-Id: I82fc75f8691da9901c7ceb808e6f6fe8e5d62c0e
 2014-12-10 17:46:56 +01:00
Bjoern Rabenstein b1e4956142 Apply a giant code cleanup. 
Essentially:

- Remove unused code.

- Make it 'go vet' clean. The only remaining warnings are in generated code.

- Make it 'golint' clean. The only remaining warnings are in gerenated code.

- Smoothed out same minor things.

Change-Id: I3fe5c1fbead27b0e7a9c247fee2f5a45bc2d42c6
 2014-12-10 16:16:49 +01:00
Julius Volz af8c6df94d Eliminate modal alerts in graphing UI. 
This shows errors in a pane under the expression input instead.

Change-Id: Iec209e1628a3b102cce9f34b2467621772dfb8ff
 2014-11-25 17:13:04 +01:00
Julius Volz 5e8d57bec1 Make tabular view the default (vs. graphing view). 
Change-Id: I9f0961f2c474e8cce5e376ce4e20040644f89370
 2014-11-25 17:13:04 +01:00
Julius Volz 3d47f94149 Drop metric names after transformations. 
After many transformations, it doesn't make sense to keep the metric
names, since the result of the transformation is no longer that metric.
This drops the metric name after such transformations and makes the web
UI deal well with missing metric names.

This depends on the current branch on the following things:

- prometheus/client_golang needs to be at
  e237cf15c6
  in branch "julius/int-fingerprints" (to be merged with new storage)

- prometheus/promdash needs to be at
  dd7691c9c2

Change-Id: Ib3c8cad8d647d9854e8c653c424b8c235ccc231d
 2014-11-25 17:13:04 +01:00
Bjoern Rabenstein 14bda4180c Changes after pair code review. 
Change-Id: Ib72d40f8e9027818cfbbd32a7a7201eebda07455
 2014-11-25 17:12:59 +01:00
Bjoern Rabenstein 006b5517e2 Simplify makefiles. 
This removes the dependancy on C leveldb and snappy.
It also takes care of fewer dependencies as they would
anyway not work on any non-Debian, non-Brew system.

Change-Id: Ia70dce1ba8a816a003587927e0b3a3f8ad2fd28c
 2014-11-25 17:10:39 +01:00
Julius Volz c3fcea45e3 Support finer time resolutions than 1 second. 
Change-Id: I4c5f1d6d2361e841999b23283d1961b1bd0c2859
 2014-11-25 17:09:04 +01:00
Brian Brazil f114bbd4e7 Make query_range more robust. 
Gracefully handle decimal values, by truncating them.

Limit amount of steps, to avoid accidentally pulling too much data.
This limit returns up to ~500kB per timeseries, and allows
for 60s granularity for a week and 1h granularity for a year.

Change-Id: Ie549fc24deb2eecbc6c5d1b6088a548a6b02e849
 2014-11-25 17:09:04 +01:00
Brian Brazil 75e37db55b Don't alert() when a query is aborted, 
such as when you change the range.

Change-Id: I574504f97446ac5f3dda737fe054ae83f17dbbc2
 2014-11-25 17:09:04 +01:00
Brian Brazil fd34e4061d Add back consoles link. 
Goes in index.html in consoles or else user data, if present.

Change-Id: I5303d30aa24ca0c20d2e0f49121e04a260b9c4f4
 2014-11-25 17:08:26 +01:00
Andres Suarez e389e63684 Focus expression after selection from dropdown 
Change-Id: Id7f67e558e3611ab4c7188cc428c342d8d3e67db
 2014-11-25 17:08:26 +01:00
Andres Suarez 86a447fc0e Allow selecting metric from Insert Metric 
Change-Id: I99e0539cab2749a8aeabc0a13015889ff45834f7
 2014-11-25 17:08:26 +01:00
Bjoern Rabenstein 71206dbc06 More code cleanups. 
Add license text everywhere.
And others....

Change-Id: I11ccde267a2ef7eb366c4788ba7aeae14ba7545c
 2014-11-25 17:07:44 +01:00
Bjoern Rabenstein f5f9f3514a Major code cleanup. 
- Make it go-vet and golint clean.
- Add comments, TODOs, etc.

Change-Id: If1392d96f3d5b4cdde597b10c8dff1769fcfabe2
 2014-11-25 17:02:53 +01:00
Julius Volz e7ed39c9a6 Initial experimental snapshot of next-gen storage. 
Change-Id: Ifb8709960dbedd1d9f5efd88cdd359ee9fa9d26d
 2014-11-25 17:02:00 +01:00
Brian Brazil 4a2b96f848 Remove backoff on scrape failure. 
Having metrics with variable timestamps inconsistently
spaced when things fail will make it harder to write correct rules.

Update status page, requires some refactoring to insert a function.

Change-Id: Ie1c586cca53b8f3b318af8c21c418873063738a8
 2014-11-25 17:02:00 +01:00
Brian Brazil f525ca5d9e Let consoles get graph links from experssions. 
Rename ConsoleLinkFromExpression, as we now have consoles.

Change-Id: I7ed2c9c83863adb390b51121dd9736845f7bcdfc
 2014-11-25 17:01:59 +01:00
Brian Brazil eba205fcac Expose path used to get to console to console. 
Change-Id: I72386a2d4e53863da302ecc5c7e44d6c310197e0
 2014-11-25 17:01:59 +01:00
Brian Brazil eb5d928da7 Fix console handler. 
This was accidnetally broken in 2128d9d811.

Change-Id: I50ea1fdb8ae4d28ae4555410bee97e5037692aa5
 2014-11-25 17:01:59 +01:00