Paired-with: Jesse Wolfe <[email protected]>
Signed-off-by: Paul Berry <[email protected]>
---
Local-branch: ticket/next/5743
...ve_source_description_from_resource_statuses.rb | 9 +++++++++
...move_source_description_from_resource_events.rb | 9 +++++++++
db/schema.rb | 10 ++++------
lib/puppet/report.rb | 6 ++----
spec/lib/puppet/report_spec.rb | 11 -----------
5 files changed, 24 insertions(+), 21 deletions(-)
create mode 100644
db/migrate/20110105231637_remove_source_description_from_resource_statuses.rb
create mode 100644
db/migrate/20110105231833_remove_source_description_from_resource_events.rb
diff --git
a/db/migrate/20110105231637_remove_source_description_from_resource_statuses.rb
b/db/migrate/20110105231637_remove_source_description_from_resource_statuses.rb
new file mode 100644
index 0000000..8bba6df
--- /dev/null
+++
b/db/migrate/20110105231637_remove_source_description_from_resource_statuses.rb
@@ -0,0 +1,9 @@
+class RemoveSourceDescriptionFromResourceStatuses < ActiveRecord::Migration
+ def self.up
+ remove_column :resource_statuses, :source_description
+ end
+
+ def self.down
+ add_column :resource_statuses, :source_description, :string
+ end
+end
diff --git
a/db/migrate/20110105231833_remove_source_description_from_resource_events.rb
b/db/migrate/20110105231833_remove_source_description_from_resource_events.rb
new file mode 100644
index 0000000..980ff4f
--- /dev/null
+++
b/db/migrate/20110105231833_remove_source_description_from_resource_events.rb
@@ -0,0 +1,9 @@
+class RemoveSourceDescriptionFromResourceEvents < ActiveRecord::Migration
+ def self.up
+ remove_column :resource_events, :source_description
+ end
+
+ def self.down
+ add_column :resource_events, :source_description, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 89aebe8..c46f73a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,7 +9,7 @@
#
# It's strongly recommended to check this file into your version control
system.
-ActiveRecord::Schema.define(:version => 20110105015322) do
+ActiveRecord::Schema.define(:version => 20110105231833) do
create_table "assignments", :force => true do |t|
t.integer "node_id"
@@ -82,7 +82,7 @@ ActiveRecord::Schema.define(:version => 20110105015322) do
create_table "old_reports", :force => true do |t|
t.integer "node_id"
- t.text "report", :limit => 16777215
+ t.text "report", :limit => 2147483647
t.datetime "created_at"
t.datetime "updated_at"
t.string "host"
@@ -132,7 +132,6 @@ ActiveRecord::Schema.define(:version => 20110105015322) do
t.string "message"
t.string "name"
t.string "property"
- t.string "source_description"
t.string "status"
t.string "tags"
t.datetime "time"
@@ -141,13 +140,12 @@ ActiveRecord::Schema.define(:version => 20110105015322) do
add_index "resource_events", ["resource_status_id"], :name =>
"index_resource_events_on_resource_status_id"
create_table "resource_statuses", :force => true do |t|
- t.integer "report_id", :null =>
false
+ t.integer "report_id", :null =>
false
t.string "resource_type"
t.string "title"
- t.decimal "evaluation_time", :precision => 12, :scale => 6
+ t.decimal "evaluation_time", :precision => 12, :scale => 6
t.string "file"
t.integer "line"
- t.string "source_description"
t.string "tags"
t.datetime "time"
t.integer "change_count"
diff --git a/lib/puppet/report.rb b/lib/puppet/report.rb
index 114bab5..15101e0 100644
--- a/lib/puppet/report.rb
+++ b/lib/puppet/report.rb
@@ -33,7 +33,7 @@ module Puppet #:nodoc:
class Event
attr_reader :name, :default_log_level, :property, :line, :resource,
- :desired_value, :time, :tags, :version, :source_description, :file,
+ :desired_value, :time, :tags, :version, :file,
:status, :previous_value, :message
def to_hash
@@ -43,7 +43,6 @@ module Puppet #:nodoc:
"message" => message,
"name" => name.to_s,
"property" => property,
- "source_description" => source_description,
"status" => status,
"tags" => tags,
"time" => time
@@ -88,7 +87,7 @@ module Puppet #:nodoc:
module Resource
class Status
- attr_reader :source_description, :evaluation_time, :resource, :tags,
+ attr_reader :evaluation_time, :resource, :tags,
:file, :events, :time, :line, :changed, :change_count,
:out_of_sync
@@ -97,7 +96,6 @@ module Puppet #:nodoc:
"evaluation_time" => evaluation_time,
"file" => file,
"line" => line,
- "source_description" => source_description,
"tags" => tags,
"time" => time,
"change_count" => change_count || 0,
diff --git a/spec/lib/puppet/report_spec.rb b/spec/lib/puppet/report_spec.rb
index 24e1b94..85f75ee 100644
--- a/spec/lib/puppet/report_spec.rb
+++ b/spec/lib/puppet/report_spec.rb
@@ -215,7 +215,6 @@ describe Puppet::Transaction::Report do
"schedule",
"monthly"
],
- "source_description" => "/Schedule[monthly]",
"file" => nil,
"out_of_sync" => nil,
"events" => [],
@@ -230,7 +229,6 @@ describe Puppet::Transaction::Report do
"filebucket",
"puppet"
],
- "source_description" => "/Filebucket[puppet]",
"file" => nil,
"out_of_sync" => nil,
"events" => [],
@@ -248,7 +246,6 @@ describe Puppet::Transaction::Report do
"default",
"class"
],
- "source_description" =>
"/Stage[main]//Node[default]/Service[mysqld]",
"file" => "/etc/puppet/manifests/site.pp",
"out_of_sync" => true,
"events" => [{
@@ -257,7 +254,6 @@ describe Puppet::Transaction::Report do
"message" => "ensure changed 'stopped' to 'running'",
"name" => "service_started",
"property" => "ensure",
- "source_description" =>
"/Stage[main]//Node[default]/Service[mysqld]/ensure",
"status" => "success",
"tags" => ["service", "mysqld", "node", "default",
"class"],
"time" => Time.parse("2010-07-22 12:19:48.921431
-07:00")
@@ -273,7 +269,6 @@ describe Puppet::Transaction::Report do
"schedule",
"never"
],
- "source_description" => "/Schedule[never]",
"file" => nil,
"out_of_sync" => nil,
"events" => [],
@@ -288,7 +283,6 @@ describe Puppet::Transaction::Report do
"schedule",
"weekly"
],
- "source_description" => "/Schedule[weekly]",
"file" => nil,
"out_of_sync" => nil,
"events" => [],
@@ -305,7 +299,6 @@ describe Puppet::Transaction::Report do
"default",
"class"
],
- "source_description" =>
"/Stage[main]//Node[default]/Exec[/bin/true]",
"file" => "/etc/puppet/manifests/site.pp",
"out_of_sync" => true,
"events" => [{
@@ -314,7 +307,6 @@ describe Puppet::Transaction::Report do
"message" => "executed successfully",
"name" => "executed_command",
"property" => "returns",
- "source_description" =>
"/Stage[main]//Node[default]/Exec[/bin/true]/returns",
"status" => "success",
"tags" => ["exec", "node", "default", "class"],
"time" => Time.parse("2010-07-22 12:19:47.360626
-07:00")
@@ -330,7 +322,6 @@ describe Puppet::Transaction::Report do
"schedule",
"puppet"
],
- "source_description" => "/Schedule[puppet]",
"file" => nil,
"out_of_sync" => nil,
"events" => [],
@@ -345,7 +336,6 @@ describe Puppet::Transaction::Report do
"schedule",
"daily"
],
- "source_description" => "/Schedule[daily]",
"file" => nil,
"out_of_sync" => nil,
"events" => [],
@@ -360,7 +350,6 @@ describe Puppet::Transaction::Report do
"schedule",
"hourly"
],
- "source_description" => "/Schedule[hourly]",
"file" => nil,
"out_of_sync" => nil,
"events" => [],
--
1.7.2
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
