Skip to content

Commit

Permalink
starting to work on fixing puppet, this should prob be a branch
Browse files Browse the repository at this point in the history
  • Loading branch information
cdav18 committed Mar 9, 2015
1 parent b1c90ae commit 9d56e44
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ class MapReducerService {
def db = mongo.getDB("test")
//TODO figure out what cross-collection data needs to be map-reduced

//

//TODO each collection should have a method for doing map-reduce
//TODO get the fields we need to map reduce for the collection
//TODO run the map-reduce jobs to get the aggregated/sorted metric building blocks we need
//TODO run a finalize to combine data to make complex metrics
def mapReduceJiraData() {
//reduce by project by day
def result = db.jiraData.mapReduce(
Expand Down
22 changes: 10 additions & 12 deletions manifests/default.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@
}
}

include apt

package{'unzip': ensure => installed }
package{'rpm': ensure => installed }
package{'groovy': ensure => installed }
#package{'mongodb-org': ensure => latest }
package{'unzip': ensure => installed }
package{'rpm': ensure => installed }
#package{'groovy': ensure => installed }
include '::mongodb::server'

# Update APT Cache
Expand All @@ -20,7 +17,7 @@
}

exec { 'apt-get update':
before => [ Class['elasticsearch'], Class['logstash'] ],
before => [ Class['elasticsearch'], Class['logstash'], Class['gvm'] ],
command => '/usr/bin/apt-get update -qq'
}

Expand Down Expand Up @@ -51,7 +48,7 @@
ensure => 'present',
status => 'enabled',
manage_repo => true,
repo_version => '1.4',
repo_version => '1.4.4',
require => [ Class['java'], File['/vagrant/elasticsearch'] ],
}->
file_line { 'update_yml':
Expand Down Expand Up @@ -116,7 +113,7 @@
}

exec { 'download_kibana':
command => '/usr/bin/curl https://download.elasticsearch.org/kibana/kibana/kibana-3.1.2.tar.gz | /bin/tar xz -C /vagrant/kibana',
command => '/usr/bin/curl https://download.elasticsearch.org/kibana/kibana/kibana-4.0.1-linux-x64.tar.gz | /bin/tar xz -C /vagrant/kibana',
creates => '/vagrant/kibana/kibana-latest/config.js',
require => [ Package['curl'], File['/vagrant/kibana'] ],
}
Expand All @@ -125,20 +122,21 @@
####
class { 'gvm' :
owner => 'vagrant',
}
require => [ Package['curl'] ],
}

gvm::package { 'grails':
version => '2.4.3',
is_default => true,
ensure => present,
require => Class['java']
require => [ Package['curl'], Class['java'] ],
}

gvm::package { 'groovy':
version => '2.3.6',
is_default => true,
ensure => present,
require => Class['java']
require => [ Package['curl'], Class['java'] ],
}

#TODO
Expand Down

0 comments on commit 9d56e44

Please sign in to comment.