Skip to content

Commit 85e56f5

Browse files
committed
update
1 parent 9430215 commit 85e56f5

File tree

7 files changed

+6
-67
lines changed

7 files changed

+6
-67
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ crash.log
1313
# OS X file
1414
static/.DS_Store
1515

16-
prometheus_rsa
16+
*_rsa
1717

1818
vendor/
1919
.bundle/

CONTRIBUTING.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1 @@
11
# Contributing
2-
3-
Prometheus uses GitHub to manage reviews of pull requests.
4-
5-
* If you have a trivial fix or improvement, go ahead and create a pull request,
6-
addressing (with `@...`) the maintainer of this repository (see
7-
[MAINTAINERS.md](MAINTAINERS.md)) in the description of the pull request.
8-
9-
* If you plan to do something more involved, first discuss your ideas
10-
on our [mailing list](https://groups.google.com/forum/?fromgroups#!forum/prometheus-developers).
11-
This will avoid unnecessary work and surely give you and us a good deal
12-
of inspiration.

Gemfile.lock

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ GEM
1111
cri (2.6.1)
1212
colored (~> 1.2)
1313
diff-lcs (1.2.5)
14-
em-websocket (0.5.1)
15-
eventmachine (>= 0.12.9)
16-
http_parser.rb (~> 0.6.0)
17-
eventmachine (1.0.8)
1814
ffi (1.9.6)
1915
formatador (0.2.5)
2016
guard (2.6.1)
@@ -23,15 +19,10 @@ GEM
2319
lumberjack (~> 1.0)
2420
pry (>= 0.9.12)
2521
thor (>= 0.18.1)
26-
guard-livereload (2.3.1)
27-
em-websocket (~> 0.5)
28-
guard (~> 2.0)
29-
multi_json (~> 1.8)
3022
guard-nanoc (1.0.2)
3123
guard (>= 1.8.0)
3224
nanoc (>= 3.6.3)
3325
hitimes (1.2.2)
34-
http_parser.rb (0.6.0)
3526
kramdown (1.4.2)
3627
listen (2.7.11)
3728
celluloid (>= 0.15.2)
@@ -40,7 +31,6 @@ GEM
4031
lumberjack (1.0.9)
4132
method_source (0.8.2)
4233
mini_portile (0.6.0)
43-
multi_json (1.11.2)
4434
nanoc (3.7.3)
4535
cri (~> 2.3)
4636
nanoc-cachebuster (0.3.1)
@@ -99,3 +89,6 @@ DEPENDENCIES
9989
rb-inotify
10090
redcarpet
10191
rspec
92+
93+
BUNDLED WITH
94+
1.14.6

Makefile

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
DOWNLOADS := prometheus alertmanager blackbox_exporter consul_exporter graphite_exporter haproxy_exporter memcached_exporter mysqld_exporter node_exporter pushgateway statsd_exporter
2-
31
clean:
42
rm -rf output downloads
53

@@ -9,17 +7,6 @@ compile: clean
97

108
deploy: github_pages_export github_pages_push
119

12-
downloads: $(DOWNLOADS:%=downloads/%/repo.json) $(DOWNLOADS:%=downloads/%/releases.json)
13-
14-
downloads/%/repo.json:
15-
@mkdir -p $(dir $@)
16-
@echo "curl -sf -H 'Accept: application/vnd.github.v3+json' <GITHUB_AUTHENTICATION> https://api.github.com/repos/prometheus/$* > $@"
17-
@curl -sf -H 'Accept: application/vnd.github.v3+json' $(GITHUB_AUTHENTICATION) https://api.github.com/repos/prometheus/$* > $@
18-
19-
downloads/%/releases.json:
20-
@mkdir -p $(dir $@)
21-
@echo "curl -sf -H 'Accept: application/vnd.github.v3+json' <GITHUB_AUTHENTICATION> https://api.github.com/repos/prometheus/$*/releases > $@"
22-
@curl -sf -H 'Accept: application/vnd.github.v3+json' $(GITHUB_AUTHENTICATION) https://api.github.com/repos/prometheus/$*/releases > $@
2310

2411
github_pages_export: compile
2512
cd output && \
@@ -28,7 +15,7 @@ github_pages_export: compile
2815
echo "This repository is auto-generated. You have to open pull requests against https://github.com/open-falcon/open-falcon.github.io instead." > .github/PULL_REQUEST_TEMPLATE.md && \
2916
git init && \
3017
git config user.name "Travis CI" && \
31-
git config user.email "travis@prometheus.io" && \
18+
git config user.email "travis@open-falcon.org" && \
3219
git add . && \
3320
git commit --message="Static site builder output, generated from 'source' branch."
3421

layouts/blog.html

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,6 @@ <h1><%= item[:title] %></h1>
77
<%= yield %>
88
<article>
99

10-
<!--
11-
<div id="disqus_thread"></div>
12-
<script type="text/javascript">
13-
/* * * CONFIGURATION VARIABLES * * */
14-
var disqus_shortname = 'prometheus-blog';
15-
16-
/* * * DON'T EDIT BELOW THIS LINE * * */
17-
(function() {
18-
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
19-
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
20-
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
21-
})();
22-
</script>
23-
<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
24-
-->
2510
</div>
2611

2712
<%= render 'blog_sidebar' %>

layouts/jobs.html

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,6 @@ <h1><%= item[:title] %></h1>
77
<%= yield %>
88
<article>
99

10-
<!--
11-
<div id="disqus_thread"></div>
12-
<script type="text/javascript">
13-
/* * * CONFIGURATION VARIABLES * * */
14-
var disqus_shortname = 'prometheus-blog';
15-
16-
/* * * DON'T EDIT BELOW THIS LINE * * */
17-
(function() {
18-
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
19-
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
20-
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
21-
})();
22-
</script>
23-
<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
24-
-->
2510
</div>
2611

2712
<%= render 'jobs_sidebar' %>

specs/download_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
describe Downloads::Asset do
55
let(:asset) do
66
Downloads::Asset.new({
7-
'name' => ' prometheus-1.2.0.freebsd-armv5.tar.gz',
7+
'name' => ' ',
88
})
99
end
1010

0 commit comments

Comments
 (0)