Skip to content

Commit

Permalink
add amon monitoring
Browse files Browse the repository at this point in the history
  • Loading branch information
maxious committed Sep 22, 2012
1 parent 1bb08ab commit 2ab261f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
6 changes: 5 additions & 1 deletion include/common.inc.php
Expand Up @@ -50,7 +50,11 @@
// Other
$tempPath = "/tmp/";
}

require $basePath."lib/amon-php/amon.php";
Amon::config(array('address'=> 'http://amon.disclosurelo.gs:2464',
'protocol' => 'http',
'secret_key' => "JBcSUdFOi5lK0vCjLjbHDpQamcBnRA4iV7QLaTADeDQ"));
Amon::setup_exception_handler();
function isDebugServer() {
if (isset($_REQUEST['debug']))
return true;
Expand Down
2 changes: 1 addition & 1 deletion js/FlashCanvas
2 changes: 1 addition & 1 deletion js/flotr2
Submodule flotr2 updated 82 files
+2 −0 .gitignore
+1 −1 LICENSE
+13 −1 Makefile
+7 −0 README.md
+54 −4 examples/js/Editor.js
+2 −1 examples/js/Example.js
+36 −16 examples/js/Examples.js
+44 −0 examples/js/examples/basic-stepped.js
+9 −8 examples/js/examples/download-data.js
+24 −12 examples/js/examples/download-image.js
+1 −1 examples/js/examples/mouse-drag.js
+1 −2 examples/js/examples/mouse-zoom.js
+1 −0 examples/js/includes.dev.js
+4 −2 examples/js/includes.min.js
+0 −2 examples/lib/google-code-prettify/lang-apollo.js
+0 −18 examples/lib/google-code-prettify/lang-clj.js
+0 −2 examples/lib/google-code-prettify/lang-css.js
+0 −1 examples/lib/google-code-prettify/lang-go.js
+0 −2 examples/lib/google-code-prettify/lang-hs.js
+0 −3 examples/lib/google-code-prettify/lang-lisp.js
+0 −2 examples/lib/google-code-prettify/lang-lua.js
+0 −2 examples/lib/google-code-prettify/lang-ml.js
+0 −4 examples/lib/google-code-prettify/lang-n.js
+0 −1 examples/lib/google-code-prettify/lang-proto.js
+0 −2 examples/lib/google-code-prettify/lang-scala.js
+0 −2 examples/lib/google-code-prettify/lang-sql.js
+0 −1 examples/lib/google-code-prettify/lang-tex.js
+0 −2 examples/lib/google-code-prettify/lang-vb.js
+0 −3 examples/lib/google-code-prettify/lang-vhdl.js
+0 −2 examples/lib/google-code-prettify/lang-wiki.js
+0 −3 examples/lib/google-code-prettify/lang-xq.js
+0 −2 examples/lib/google-code-prettify/lang-yaml.js
+0 −1 examples/lib/google-code-prettify/prettify.css
+0 −28 examples/lib/google-code-prettify/prettify.js
+9 −0 examples/lib/jquery.ba-hashchange.min.js
+5,642 −0 flotr2.amd.js
+1 −1 flotr2.examples.min.js
+80 −23 flotr2.examples.types.js
+1 −1 flotr2.ie.min.js
+941 −516 flotr2.js
+17 −2 flotr2.min.js
+40 −52 js/Axis.js
+5 −0 js/Color.js
+18 −0 js/DOM.js
+115 −50 js/Date.js
+4 −0 js/DefaultOptions.js
+22 −6 js/EventAdapter.js
+13 −12 js/Flotr.js
+140 −71 js/Graph.js
+8 −4 js/Series.js
+1 −1 js/Text.js
+4 −0 js/amd/post.js
+15 −0 js/amd/pre.js
+24 −13 js/plugins/crosshair.js
+5 −3 js/plugins/download.js
+15 −3 js/plugins/grid.js
+73 −63 js/plugins/handles.js
+67 −36 js/plugins/hit.js
+4 −3 js/plugins/labels.js
+52 −38 js/plugins/legend.js
+93 −61 js/plugins/selection.js
+69 −81 js/plugins/spreadsheet.js
+4 −4 js/plugins/titles.js
+47 −18 js/types/bars.js
+30 −0 js/types/bubbles.js
+8 −7 js/types/candles.js
+120 −18 js/types/lines.js
+3 −1 js/types/markers.js
+30 −30 js/types/pie.js
+4 −3 js/types/points.js
+1 −1 js/types/radar.js
+427 −1 lib/jasmine/jasmine-html.js
+81 −166 lib/jasmine/jasmine.css
+245 −192 lib/jasmine/jasmine.js
+19 −18 lib/underscore-min.js
+1 −0 make/examples.json
+4 −2 make/lib.json
+5 −3 spec/index.html
+2 −0 spec/jasmine.yml
+816 −461 spec/js/flotr2.stable.js
+31 −0 spec/js/test-boundaries.js
+44 −0 spec/js/test-mountain-nulls.js
2 changes: 1 addition & 1 deletion lib/Requests
2 changes: 1 addition & 1 deletion lib/amon-php

0 comments on commit 2ab261f

Please sign in to comment.