RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2025-03-11 07:59:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
488 Commits 262 Branches 456 Tags 675 MiB
c0cd565430
Commit Graph

488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johannes 'fish' Ziemke
c108a9978d Merge branch 'master' of github.com:prometheus/prometheus into feature/navigation 
Conflicts:
	web/web.go
 2013-04-05 14:16:33 +02:00
Matt T. Proud
d79c932a8e Merge pull request #120 from prometheus/feature/storage/compaction 
Spin up curator run in the tests.
 2013-04-05 04:55:59 -07:00
Matt T. Proud
c3e3460ca6 Spin up curator run in the tests. 
After this commit, we'll need to add validations that it does the
desired work, which we presently know that it doesn't.  Given the
changes I made with a plethora of renamings, I want to commit this
now before it gets even larger.
 2013-04-05 13:55:11 +02:00
Johannes 'fish' Ziemke
0f775a4178 Use Sprintf instead of string concatenation. 2013-04-05 13:41:52 +02:00
Johannes 'fish' Ziemke
1c091a9723 Use client_golang.exp for automatic telemetry. 2013-04-05 13:24:50 +02:00
Johannes 'fish' Ziemke
3aead8468c Fix typo. 2013-04-04 19:19:58 +02:00
Johannes 'fish' Ziemke
84d17b4d97 Replace YieldExporter() with Handler() 2013-04-04 19:08:20 +02:00
Johannes 'fish' Ziemke
1cb4c819e1 Remove cruft. 2013-04-04 19:02:29 +02:00
Johannes 'fish' Ziemke
1a3fb459e0 Add navigation menu to all pages + change routes. 
To achieve that, this PR
- converts static/index.html ("console") and graph to templates
- moved the handlebars template to separated file to avoid escaping issues

Route changes:
/status -> /
/static -> /console
/static/graph.html -> /graph
 2013-04-04 16:36:53 +02:00
Matt T. Proud
461da0b3a8 Merge pull request #117 from prometheus/feature/storage/compaction 
Spin up storage layers for made fixtures.
 2013-04-03 04:41:52 -07:00
Matt T. Proud
d0ad6cbeaa Spin up storage layers for made fixtures. 2013-04-03 12:09:05 +02:00
Matt T. Proud
25fa3af0e4 Merge pull request #116 from prometheus/refactor/dependencies/update-client-api 
Update to use new default handler.
 2013-04-02 06:58:23 -07:00
Matt T. Proud
7764682c7c Update to use new default handler. 2013-04-02 15:20:30 +02:00
Matt T. Proud
2116c7ff8c Merge pull request #112 from prometheus/julius-allow-oneletter-metrics 
Allow single-letter identifiers (metric and label names).
 2013-03-28 10:39:40 -07:00
Julius Volz
e31591e6fe Allow single-letter identifiers (metric and label names). 2013-03-28 18:37:54 +01:00
juliusv
a4b528118d Merge pull request #113 from prometheus/julius-travis-verbose-tests 
Make Travis test runs verbose.
 2013-03-28 10:37:30 -07:00
Julius Volz
8b91bffa1d Make Travis test runs verbose. 2013-03-28 18:30:24 +01:00
juliusv
8622df50ae Merge pull request #111 from prometheus/julius-depointerize 
Depointerize Matrix/Vector types as well as time.Time arguments.
 2013-03-28 10:07:34 -07:00
Julius Volz
ec413459fa Depointerize Matrix/Vector types as well as time.Time arguments. 2013-03-28 18:07:12 +01:00
juliusv
b912f75d11 Merge pull request #110 from prometheus/julius-query-interpolation 
Implement sample interpolation in query layer.
 2013-03-28 09:25:22 -07:00
Julius Volz
676845afaf Implement sample interpolation in query layer. 2013-03-28 16:41:51 +01:00
Matt T. Proud
9d46b941ea Include Travis status. 
I am going to regret this.
 2013-03-28 15:54:40 +01:00
Julius Volz
c59f3fc538 Fix formatting in tiered_test.go. 2013-03-28 12:16:31 +01:00
juliusv
0f48af8032 Merge pull request #109 from prometheus/documentation/community/mailinglists 
Update community documentation.
 2013-03-28 02:52:22 -07:00
Matt T. Proud
a9640c0203 Update community documentation. 
Include mailing list notes and additional contributors.

Include generated documentation.

Correct title case.
 2013-03-28 10:46:41 +01:00
juliusv
39826d7335 Merge pull request #107 from prometheus/julius-fix-get-fingerprints 
Fix bug in GetFingerprintsForLabelSet().
 2013-03-27 10:54:17 -07:00
Julius Volz
2668700e54 Fix bug in GetFingerprintsForLabelSet(). 2013-03-27 18:50:30 +01:00
Johannes 'fish' Ziemke
fed467ede0 Moved graph and console to use templates as well. 2013-03-27 18:44:47 +01:00
Matt T. Proud
cef0dcb079 Merge pull request #105 from prometheus/feature/storage/compaction 
Test Data for Curator
 2013-03-27 10:30:58 -07:00
Matt T. Proud
c53a72a894 Test data for the curator. 2013-03-27 18:13:43 +01:00
Matt T. Proud
8e15a4282f Test data for the curator. 2013-03-27 18:10:34 +01:00
Julius Volz
542bb6748e Eliminate need to get fingerprints during query execution time. 2013-03-27 18:10:34 +01:00
Johannes 'fish' Ziemke
f27adac848 Split status template into two templates. 
This is now using a base template (_base.html) for the 'layout' of the web UI.
Within that base template, the actual content templates get rendered.
 2013-03-27 17:40:01 +01:00
juliusv
7034c3981f Merge pull request #104 from prometheus/julius-eliminate-query-fingerprinting 
Eliminate need to get fingerprints during query execution time.
 2013-03-27 07:38:17 -07:00
Matt T. Proud
3ab0669454 Merge pull request #103 from prometheus/tests/leveldb/storage-building 
Include LevelDB fixture generators for curator.
 2013-03-27 07:14:14 -07:00
Matt T. Proud
6dcaa28806 Include LevelDB fixture generators for curator. 
This will help reduce common boilerplate for our test process
with respect to LevelDB-related things.
 2013-03-27 15:13:40 +01:00
Julius Volz
b836066c71 Eliminate need to get fingerprints during query execution time. 2013-03-27 14:42:03 +01:00
Matt T. Proud
a4f0578a7e Merge pull request #102 from prometheus/julius-tiered-error-handling 
More userfriendly output when we fail to create the tiered storage.
 2013-03-27 03:41:40 -07:00
Julius Volz
55ca65aa6e More userfriendly output when we fail to create the tiered storage. 2013-03-27 11:25:05 +01:00
Matt T. Proud
c4e971d7d9 Merge pull request #101 from prometheus/refactor/test/directory-extraction 
Create temporary directory handler.
 2013-03-26 10:46:28 -07:00
juliusv
40cc435feb Merge pull request #100 from prometheus/julius-view-abortion 
Abort view job processing on timeout.
 2013-03-26 10:31:19 -07:00
Matt T. Proud
b86b0ea41a Create temporary directory handler. 2013-03-26 18:09:25 +01:00
Julius Volz
8cf2af3923 Abort view job processing on timeout. 2013-03-26 17:18:51 +01:00
Matt T. Proud
00009e4ad1 Merge pull request #99 from prometheus/julius-constantize-name 
Constantize metric name label name.
 2013-03-26 08:33:23 -07:00
Julius Volz
2b8f0b2cc7 Constantize metric name label name. 2013-03-26 16:20:23 +01:00
juliusv
567a998e63 Merge pull request #98 from prometheus/julius-integrate-tiered-layers 
Implement tiered data integration for simple (non-value) Get* methods
 2013-03-26 07:34:59 -07:00
Julius Volz
e096896932 PR comment fixups. 2013-03-26 15:28:00 +01:00
Julius Volz
dd67ab115b Change GetAllMetricNames() to GetAllValuesForLabel(). 2013-03-26 14:47:07 +01:00
Julius Volz
42bdf921d1 Fetch integrated memory/disk data for simple Get* functions. 2013-03-26 14:47:07 +01:00
Julius Volz
11bb94a7e5 Implement GetAllMetricNames() for memory storage. 2013-03-26 14:47:07 +01:00