github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,176 Commits
275 Branches
452 Tags
639 MiB
Commit Graph

12 Commits (9a70ee752e36bc570f57674e579f4aeb400f6396)

Author SHA1 Message Date
Fabian Reinartz 306e8468a0 Switch from client_golang/model to common/model 2015-08-21 13:33:38 +02:00
Fabian Reinartz 749ae450c5 promql: add runbook to alert statement. 
This commit adds the RUNBOOK keyword to alert statements. The field
is optional and expected to be a link.
 2015-06-25 13:00:52 +02:00
Fabian Reinartz a0b3aaa551 notification: remove flags 2015-06-15 19:01:06 +02:00
Brian Brazil 75e8b48c87 Change case of alert json to initial lower letter. 
This is more in line with common practice,
and with the webhook in alertmanager this will
be more directly exposed to users.
 2015-05-30 14:35:51 +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
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
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 1491fb9370 Update GeneratorURL field name in notification tests. 
Change-Id: Ic4357999b6ebcf54008869a395e56d12a0ead211
 2014-11-25 17:13:04 +01:00
Bjoern Rabenstein b3ed9aa7a2 Clean up start-up and shut-down. 
Change-Id: Idff4bbb0a15a9f879bfbb3da5b1025179cab5e2c
 2014-11-25 17:08:45 +01:00
Brian Brazil e041c0cd46 Add console and alert templates with access to all data. 
Move rulemanager to it's own package to break cicrular dependency.
Make NewTestTieredStorage available to tests, remove duplication.

Change-Id: I33b321245a44aa727bfc3614a7c9ae5005b34e03
 2014-05-30 16:24:56 +01:00
Julius Volz 1eb1ceac8c Add alert-expression console links to notifications. 
The ConsoleLinkForExpression() function now escapes console URLs in such a way
that works both in emails and in HTML.

Change-Id: I917bae0b526cbbac28ccd2a4ec3c5ac03ee4c647
 2013-08-20 15:45:41 +02:00
Julius Volz 3b970c5133 Add variable interpolation to notification messages. 
This includes required refactorings to enable replacing the http client (for
testing) and moving the NotificationReq type definitions to the "notifications"
package, so that this package doesn't need to depend on "rules" anymore and
that it can instead use a representation of the required data which only
includes the necessary fields.
 2013-08-12 12:29:08 +02:00