Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
29c737c
Update README.md
sebthebert Nov 9, 2014
9ef8262
Update dist.ini
sebthebert Nov 9, 2014
b27ac84
Update README.md
sebthebert Nov 9, 2014
7141bd3
Update README.md
sebthebert Nov 9, 2014
c2d9f10
xml2json Services configuration files completed
sebthebert Nov 9, 2014
37253a4
Merge branch 'Octopussy-2.0' of https://github.com/sebthebert/Octopus…
sebthebert Nov 9, 2014
dc46468
Update xml2json.pl
sebthebert Nov 10, 2014
4c237de
Update README.md
sebthebert Nov 10, 2014
279e7b3
xml2json Tables configuration files completed
sebthebert Nov 10, 2014
7c0ed54
xml2json Tables configuration files completed (2/2)
sebthebert Nov 10, 2014
322b88e
xml2json loglevel & taxonomy configuration files completed
sebthebert Nov 10, 2014
457a10c
Starting octopussy_api.pl
sebthebert Nov 11, 2014
b84d5eb
Octopussy WebConsole base
sebthebert Nov 11, 2014
1dbf798
API updated for loglevel & taxonomy
sebthebert Nov 11, 2014
9abc868
xml2json services updated
sebthebert Nov 20, 2014
4b1c16c
I18N fr updated
sebthebert Nov 20, 2014
570f649
Changes in OneTool::LogManagement::Configuration
sebthebert Nov 20, 2014
08ea6ef
Working on templates
sebthebert Nov 20, 2014
be5fae2
Update README.md
sebthebert Nov 21, 2014
6b7d6ed
Removing 'AAT_Box*.inc' files
sebthebert Dec 4, 2014
6500822
Merge branch 'Octopussy-2.0' of https://github.com/sebthebert/Octopus…
sebthebert Dec 4, 2014
64da3f0
Removing 'AAT_DD_Box*.inc' files
sebthebert Dec 4, 2014
367e764
Removing 'AAT_*.js' files
sebthebert Dec 4, 2014
0dfcbda
Removing '*_Inc.inc' files
sebthebert Dec 4, 2014
27c801a
xml2json types configuration file completed
sebthebert Dec 4, 2014
aac81a6
Removing 'AAT/IMG/buttons/*' files
sebthebert Dec 4, 2014
c36402b
Removing 'AAT/THEMES/*' files
sebthebert Dec 4, 2014
e55969a
Starting .openshift configuration...
sebthebert Dec 5, 2014
d4e55bc
Create OpenShift.md
sebthebert Dec 5, 2014
d531f14
lib/oneTool/Web/* modules added
sebthebert Dec 5, 2014
4130a83
Update OpenShift.md
sebthebert Dec 5, 2014
3bf6352
Merge branch 'Octopussy-2.0' of https://github.com/sebthebert/Octopus…
sebthebert Dec 5, 2014
ae672a7
Templates updated
sebthebert Dec 5, 2014
ae9c29a
OpenShift build action added
sebthebert Dec 5, 2014
fa67b69
OpenShift user action hooks updated
sebthebert Dec 5, 2014
6e1e6a7
Merge ssh://demo-octopussy.rhcloud.com/~/git/demo into Octopussy-2.0
sebthebert Dec 5, 2014
62a7615
Update OpenShift.md
sebthebert Dec 5, 2014
e511c4d
Update OpenShift.md
sebthebert Dec 5, 2014
3bb1dca
Update OpenShift.md
sebthebert Dec 6, 2014
f9b4289
Creating template
Dec 6, 2014
60c8a50
Update OpenShift.md
sebthebert Dec 6, 2014
487f59b
Working on OpenShift configuration
sebthebert Dec 6, 2014
9239df2
Merge branch 'master' of ssh://api-octopussy.rhcloud.com/~/git/api in…
sebthebert Dec 6, 2014
a137557
Working on OpenShift
sebthebert Dec 6, 2014
855ab3e
Working on OpenShift
sebthebert Dec 6, 2014
26244d1
Working on OpenShift configuration
sebthebert Dec 7, 2014
5526779
Working on OpenShift configuration
sebthebert Dec 7, 2014
f20117f
xml2json timeperiods configuration file completed
sebthebert Dec 7, 2014
fcde286
dist.ini simplification for Octopussy 2.0 first tests
sebthebert Dec 11, 2014
052f15c
Moving temporarily old tests to t_old/ directory
sebthebert Dec 11, 2014
387281d
dist.ini simplification for Octopussy 2.0 first tests
sebthebert Dec 11, 2014
d1b7dee
Bootstrap Material Design integration
sebthebert Dec 17, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
RewriteEngine On
RewriteCond %{REQUEST_URI} ^/favicon\.ico$
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule (.*) $1 [R=404,L]

5 changes: 5 additions & 0 deletions .openshift/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
The OpenShift `perl` cartridge documentation can be found at:
http://openshift.github.io/documentation/oo_cartridge_guide.html#perl

For information about .openshift directory, consult the documentation:
http://openshift.github.io/documentation/oo_user_guide.html#the-openshift-directory
3 changes: 3 additions & 0 deletions .openshift/action_hooks/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
For information about action hooks, consult the documentation:

http://openshift.github.io/documentation/oo_user_guide.html#action-hooks
4 changes: 4 additions & 0 deletions .openshift/action_hooks/build
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

echo "[build Hook]"
echo "Nothing to do..."
4 changes: 4 additions & 0 deletions .openshift/action_hooks/deploy
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

echo "[deploy Hook]"
echo "Nothing to do..."
4 changes: 4 additions & 0 deletions .openshift/action_hooks/post-deploy
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

echo "[post-deploy Hook]"
echo "Nothing to do..."
4 changes: 4 additions & 0 deletions .openshift/action_hooks/pre-build
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

echo "[pre-build Hook]"
echo "Nothing to do..."
4 changes: 4 additions & 0 deletions .openshift/action_hooks/prepare
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

echo "[prepare Hook]"
echo "Nothing to do..."
6 changes: 6 additions & 0 deletions .openshift/action_hooks/start
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

DIR_PERL=$OPENSHIFT_HOMEDIR/app-root/data/perl-5.16.3
DIR_APP_REPO=$OPENSHIFT_HOMEDIR/app-root/repo/

nohup $DIR_PERL/bin/perl $DIR_APP_REPO/bin/octopussy_api.pl --listen 'http://$OPENSHIFT_PERL_IP:$OPENSHIFT_PERL_PORT' > /dev/null 2>&1 &
2 changes: 2 additions & 0 deletions .openshift/cpan.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Mojolicious
Template
27 changes: 27 additions & 0 deletions .openshift/cron/README.cron
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Run scripts or jobs on a periodic basis
=======================================
Any scripts or jobs added to the minutely, hourly, daily, weekly or monthly
directories will be run on a scheduled basis (frequency is as indicated by the
name of the directory) using run-parts.

run-parts ignores any files that are hidden or dotfiles (.*) or backup
files (*~ or *,) or named *.{rpmsave,rpmorig,rpmnew,swp,cfsaved}

The presence of two specially named files jobs.deny and jobs.allow controls
how run-parts executes your scripts/jobs.
jobs.deny ===> Prevents specific scripts or jobs from being executed.
jobs.allow ===> Only execute the named scripts or jobs (all other/non-named
scripts that exist in this directory are ignored).

The principles of jobs.deny and jobs.allow are the same as those of cron.deny
and cron.allow and are described in detail at:
http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Deployment_Guide/ch-Automating_System_Tasks.html#s2-autotasks-cron-access

See: man crontab or above link for more details and see the the weekly/
directory for an example.

PLEASE NOTE: The Cron cartridge must be installed in order to run the configured jobs.

For more information about cron, consult the documentation:
http://openshift.github.io/documentation/oo_cartridge_guide.html#cron
http://openshift.github.io/documentation/oo_user_guide.html#cron
Empty file.
Empty file.
Empty file.
Empty file.
16 changes: 16 additions & 0 deletions .openshift/cron/weekly/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Run scripts or jobs on a weekly basis
=====================================
Any scripts or jobs added to this directory will be run on a scheduled basis
(weekly) using run-parts.

run-parts ignores any files that are hidden or dotfiles (.*) or backup
files (*~ or *,) or named *.{rpmsave,rpmorig,rpmnew,swp,cfsaved} and handles
the files named jobs.deny and jobs.allow specially.

In this specific example, the chronograph script is the only script or job file
executed on a weekly basis (due to white-listing it in jobs.allow). And the
README and chrono.dat file are ignored either as a result of being black-listed
in jobs.deny or because they are NOT white-listed in the jobs.allow file.

For more details, please see ../README.cron file.

1 change: 1 addition & 0 deletions .openshift/cron/weekly/chrono.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Time And Relative D...n In Execution (Open)Shift!
3 changes: 3 additions & 0 deletions .openshift/cron/weekly/chronograph
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

echo "`date`: `cat $(dirname \"$0\")/chrono.dat`"
12 changes: 12 additions & 0 deletions .openshift/cron/weekly/jobs.allow
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#
# Script or job files listed in here (one entry per line) will be
# executed on a weekly-basis.
#
# Example: The chronograph script will be executed weekly but the README
# and chrono.dat files in this directory will be ignored.
#
# The README file is actually ignored due to the entry in the
# jobs.deny which is checked before jobs.allow (this file).
#
chronograph

7 changes: 7 additions & 0 deletions .openshift/cron/weekly/jobs.deny
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#
# Any script or job files listed in here (one entry per line) will NOT be
# executed (read as ignored by run-parts).
#

README

3 changes: 3 additions & 0 deletions .openshift/markers/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
For information about markers, consult the documentation:

http://openshift.github.io/documentation/oo_user_guide.html#markers
Empty file added .openshift/markers/hot_deploy
Empty file.
45 changes: 45 additions & 0 deletions OpenShift.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
Octopussy 2.0 demo on OpenShift
===============================

# Configuration

## OpenShift configuration

### Perl

Octopussy 2.0 requires Mojolicious so we need a newer Perl version:

```shell
cd ~/app-root/data/
mkdir download
cd download
wget -c -nd http://www.cpan.org/src/5.0/perl-perl-5.16.3.tar.gz
tar -xf perl-perl-5.16.3.tar.gz
cd perl-perl-5.16.3
./Configure -des -Dprefix=~/app-root/data/perl-5.16.3
make
make install
```

```shell
cd ~/app-root/data/perl-5.16.3/bin
HOME=~/app-root/data/
./perl cpan App::cpanminus

./cpanm --force IO::Socket::IP
./cpanm Time::HiRes
./cpanm --force Mojolicious
./cpanm Template
./cpanm --force Mojolicious::Plugin::TtRenderer
./cpanm --force Mojolicious::Plugin::I18N
```

### OpenShift Hooks

## Git configuration

I need to `git push` on Github and on OpenShift:
```
git remote set-url origin --push --add ssh://54823b5de0b8cd0fcd00014a@webconsole-octopussy.rhcloud.com/~/git/webconsole.git/
git remote set-url origin --push --add ssh://54824468e0b8cd9b0c0001b3@api-octopussy.rhcloud.com/~/git/api.git/
```
25 changes: 20 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
Octopussy
=========
Octopussy 2.0
=============

Octopussy - Open Source Log Management Solution
# What's new ?

* Complete rewriting of the Web Interface, moving from [Apache::ASP](https://metacpan.org/pod/Apache::ASP) to [Mojolicious](https://metacpan.org/pod/Mojolicious).
* API in order to have many Octopussy servers managed with the same web interface.

# TODO List

## Moving configuration files from XML to JSON

See [Issue #610](https://github.com/sebthebert/Octopussy/issues/610)

## Server Daemon publishing API

See [Issue #611](https://github.com/sebthebert/Octopussy/issues/611)

## Mojolicious Web Interface connected with many Server Daemon publishing API

See [Issue #613](https://github.com/sebthebert/Octopussy/issues/613)

**Official Web Site:** www.octopussy.pm

**Official Documentation:** also [on GitHub](https://github.com/sebthebert/Octopussy_Documentation/blob/master/00_Documentation.md)
26 changes: 26 additions & 0 deletions bin/octopussy_api.pl
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/perl

=head1 NAME

octopussy_api.pl - Octopussy API

=cut

use strict;
use warnings;

use FindBin;

use lib "$FindBin::Bin/../lib/";

require Mojolicious::Commands;
Mojolicious::Commands->start_app(
'OneTool::LogManagement::Server::API',
'daemon',
'-l', 'http://*:2000');

=head1 AUTHOR

Sebastien Thebert <octopussy@onetool.pm>

=cut
17 changes: 17 additions & 0 deletions bin/octopussy_webconsole.pl
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/perl

use strict;
use warnings;

use FindBin;
BEGIN { unshift @INC, "$FindBin::Bin/../lib" }

# Start command line interface for application
require Mojolicious::Commands;
Mojolicious::Commands->start_app('OneTool::Web');

=head1 AUTHOR

Sebastien Thebert <octopussy@onetool.pm>

=cut
37 changes: 37 additions & 0 deletions conf/logmanagement/loglevel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[
{
"color" : "red",
"level" : "7",
"value" : "Emergency"
},
{
"color" : "darkred",
"level" : "6",
"value" : "Alert"
},
{
"color" : "maroon",
"level" : "5",
"value" : "Critical"
},
{
"color" : "orange",
"level" : "4",
"value" : "Warning"
},
{
"color" : "green",
"level" : "3",
"value" : "Notice"
},
{
"color" : "blue",
"level" : "2",
"value" : "Information"
},
{
"color" : "gray",
"level" : "1",
"value" : "Debug"
}
]
85 changes: 85 additions & 0 deletions conf/logmanagement/services/ACPI.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
{
"messages" : [
{
"pattern" : "<@DATE_TIME_ISO:datetime@> <@WORD:device@> <@REGEXP(\"acpid\"):daemon@>: <@REGEXP(\"client connected.+\"):msg@>",
"table" : "Message",
"id" : "client_connected",
"taxonomy" : "System",
"loglevel" : "Notice"
},
{
"pattern" : "<@DATE_TIME_ISO:datetime@> <@WORD:device@> <@REGEXP(\"acpid\"):daemon@>: <@REGEXP(\"client.+ has disconnected\"):msg@>",
"table" : "Message",
"id" : "client_has_disconnected",
"taxonomy" : "System",
"loglevel" : "Notice"
},
{
"pattern" : "<@DATE_TIME_ISO:datetime@> <@WORD:device@> <@REGEXP(\"acpid\"):daemon@>: <@REGEXP(\".+ rule loaded\"):msg@>",
"table" : "Message",
"id" : "rule_loaded",
"taxonomy" : "System",
"loglevel" : "Information"
},
{
"pattern" : "<@DATE_TIME_ISO:datetime@> <@WORD:device@> <@REGEXP(\"acpid\"):daemon@>: <@REGEXP(\"exiting\"):msg@>",
"table" : "Message",
"id" : "exiting",
"taxonomy" : "Application.Stop",
"loglevel" : "Notice"
},
{
"pattern" : "<@DATE_TIME_ISO:datetime@> <@WORD:device@> <@REGEXP(\"acpid\"):daemon@>: <@REGEXP(\"received event .+\"):msg@>",
"table" : "Message",
"id" : "received_event",
"taxonomy" : "System",
"loglevel" : "Information"
},
{
"pattern" : "<@DATE_TIME_ISO:datetime@> <@WORD:device@> <@REGEXP(\"acpid\"):daemon@>: <@REGEXP(\"notifying client .+\"):msg@>",
"table" : "Message",
"id" : "notifying_client",
"taxonomy" : "System",
"loglevel" : "Information"
},
{
"pattern" : "<@DATE_TIME_ISO:datetime@> <@WORD:device@> <@REGEXP(\"acpid\"):daemon@>: <@REGEXP(\"completed event .+\"):msg@>",
"table" : "Message",
"id" : "completed_event",
"taxonomy" : "System",
"loglevel" : "Information"
},
{
"pattern" : "<@DATE_TIME_ISO:datetime@> <@WORD:device@> <@REGEXP(\"acpid\"):daemon@>: <@REGEXP(\"executing action .+\"):msg@>",
"table" : "Message",
"id" : "executing_action",
"taxonomy" : "System",
"loglevel" : "Information"
},
{
"pattern" : "<@DATE_TIME_ISO:datetime@> <@WORD:device@> <@REGEXP(\"acpid\"):daemon@>: <@REGEXP(\"action exited with status.+\"):msg@>",
"table" : "Message",
"id" : "action_exited_with_status",
"taxonomy" : "System",
"loglevel" : "Information"
},
{
"pattern" : "<@DATE_TIME_ISO:datetime@> <@WORD:device@> <@REGEXP(\"acpid\"):daemon@>: <@REGEXP(\"starting up with .+\"):msg@>",
"table" : "Message",
"id" : "starting_up_with",
"taxonomy" : "System",
"loglevel" : "Information"
},
{
"pattern" : "<@DATE_TIME_ISO:datetime@> <@WORD:device@> <@REGEXP(\"acpid\"):daemon@>: <@REGEXP(\"waiting for events: .+\"):msg@>",
"table" : "Message",
"id" : "waiting_for_events",
"taxonomy" : "System",
"loglevel" : "Information"
}
],
"website" : "http://sourceforge.net/projects/acpid/",
"version" : "201208090003",
"name" : "ACPI",
"description" : "ACPI Service"
}
Loading