Skip to content

Commit

Permalink
Extra debug line for Acknowledgments.
Browse files Browse the repository at this point in the history
  • Loading branch information
David Krider committed Oct 25, 2012
1 parent f38672e commit 7885ddf
Show file tree
Hide file tree
Showing 5 changed files with 159 additions and 166 deletions.
296 changes: 148 additions & 148 deletions app/controllers/messages_controller.rb
View file
@@ -1,153 +1,153 @@
class MessagesController < ApplicationController
# GET /messages
# GET /messages.xml
def index
#@messages = Message.all
# GET /messages
# GET /messages.xml
def index
#@messages = Message.all
# See config/environment.rb
@messages = Message.paginate :page => params[:page],
:order => "created_at DESC", :per_page => 15
respond_to do |format|
format.html # index.html.erb
format.xml { render :xml => @messages }
end
end

# GET /messages/1
# GET /messages/1.xml
def show
@message = Message.find(params[:id])

respond_to do |format|
format.html # show.html.erb
format.xml { render :xml => @message }
end
end

# GET /messages/new
# GET /messages/new.xml
def new
@message = Message.new

respond_to do |format|
format.html # new.html.erb
format.xml { render :xml => @message }
end
end

# GET /messages/1/edit
def edit
@message = Message.find(params[:id])
end

# POST /messages
# POST /messages.xml
def create
@message = Message.new(params[:message])

respond_to do |format|
if @message.save
flash[:notice] = 'Message was successfully created.'
format.html { redirect_to(@message) }
format.xml { render :xml => @message, :status => :created, :location => @message }
else
format.html { render :action => "new" }
format.xml { render :xml => @message.errors, :status => :unprocessable_entity }
end
end
end

# PUT /messages/1
# PUT /messages/1.xml
def update
@message = Message.find(params[:id])

respond_to do |format|
if @message.update_attributes(params[:message])
flash[:notice] = 'Message was successfully updated.'
format.html { redirect_to(@message) }
format.xml { head :ok }
else
format.html { render :action => "edit" }
format.xml { render :xml => @message.errors, :status => :unprocessable_entity }
end
end
end

# DELETE /messages/1
# DELETE /messages/1.xml
def destroy
@message = Message.find(params[:id])
@message.destroy

respond_to do |format|
format.html { redirect_to(messages_url) }
format.xml { head :ok }
end
end

def search

end


def results
@query = "SELECT * FROM messages"
unless params[:message][:sender] == ""
if @query == "SELECT * FROM messages"
@query += " WHERE"
else
@query += " AND"
end
@query += " sender LIKE '%" +
params[:message][:sender].gsub(/'/, "''") + "%'"
end
unless params[:message][:recipients] == ""
if @query == "SELECT * FROM messages"
@query += " WHERE"
else
@query += " AND"
end
@query += " recipients_direct LIKE '%" +
params[:message][:recipients].gsub(/'/, "''") + "%'"
end
unless params[:message][:subject] == ""
if @query == "SELECT * FROM messages"
@query += " WHERE"
else
@query += " AND"
end
@query += " subject LIKE '%" +
params[:message][:subject].gsub(/'/, "''") + "%'"
end
unless params[:message][:body] == ""
if @query == "SELECT * FROM messages"
@query += " WHERE"
else
@query += " AND"
end
@query += " body LIKE '%" +
params[:message][:body].gsub(/'/, "''") + "%'"
end
unless params[:message][:keywords] == ""
if @query == "SELECT * FROM messages"
@query += " WHERE"
else
@query += " AND"
end
@query += " keywords LIKE '%" +
params[:message][:keywords].gsub(/'/, "''") + "%'"
end
unless params[:message][:state] == ""
if @query == "SELECT * FROM messages"
@query += " WHERE"
else
@query += " AND"
end
@query += " state = '" +
params[:message][:state].gsub(/'/, "''") + "'"
end
@query += " ORDER BY created_at DESC LIMIT 250"
@messages = Message.find_by_sql(@query)
end
respond_to do |format|
format.html # index.html.erb
format.xml { render :xml => @messages }
end
end

# GET /messages/1
# GET /messages/1.xml
def show
@message = Message.find(params[:id])

respond_to do |format|
format.html # show.html.erb
format.xml { render :xml => @message }
end
end

# GET /messages/new
# GET /messages/new.xml
def new
@message = Message.new

respond_to do |format|
format.html # new.html.erb
format.xml { render :xml => @message }
end
end

# GET /messages/1/edit
def edit
@message = Message.find(params[:id])
end

# POST /messages
# POST /messages.xml
def create
@message = Message.new(params[:message])

respond_to do |format|
if @message.save
flash[:notice] = 'Message was successfully created.'
format.html { redirect_to(@message) }
format.xml { render :xml => @message, :status => :created, :location => @message }
else
format.html { render :action => "new" }
format.xml { render :xml => @message.errors, :status => :unprocessable_entity }
end
end
end

# PUT /messages/1
# PUT /messages/1.xml
def update
@message = Message.find(params[:id])

respond_to do |format|
if @message.update_attributes(params[:message])
flash[:notice] = 'Message was successfully updated.'
format.html { redirect_to(@message) }
format.xml { head :ok }
else
format.html { render :action => "edit" }
format.xml { render :xml => @message.errors, :status => :unprocessable_entity }
end
end
end

# DELETE /messages/1
# DELETE /messages/1.xml
def destroy
@message = Message.find(params[:id])
@message.destroy

respond_to do |format|
format.html { redirect_to(messages_url) }
format.xml { head :ok }
end
end


def search

end


def results
@query = "SELECT * FROM messages"
unless params[:message][:sender] == ""
if @query == "SELECT * FROM messages"
@query += " WHERE"
else
@query += " AND"
end
@query += " sender LIKE '%" +
params[:message][:sender].gsub(/'/, "''") + "%'"
end
unless params[:message][:recipients] == ""
if @query == "SELECT * FROM messages"
@query += " WHERE"
else
@query += " AND"
end
@query += " recipients_direct LIKE '%" +
params[:message][:recipients].gsub(/'/, "''") + "%'"
end
unless params[:message][:subject] == ""
if @query == "SELECT * FROM messages"
@query += " WHERE"
else
@query += " AND"
end
@query += " subject LIKE '%" +
params[:message][:subject].gsub(/'/, "''") + "%'"
end
unless params[:message][:body] == ""
if @query == "SELECT * FROM messages"
@query += " WHERE"
else
@query += " AND"
end
@query += " body LIKE '%" +
params[:message][:body].gsub(/'/, "''") + "%'"
end
unless params[:message][:keywords] == ""
if @query == "SELECT * FROM messages"
@query += " WHERE"
else
@query += " AND"
end
@query += " keywords LIKE '%" +
params[:message][:keywords].gsub(/'/, "''") + "%'"
end
unless params[:message][:state] == ""
if @query == "SELECT * FROM messages"
@query += " WHERE"
else
@query += " AND"
end
@query += " state = '" +
params[:message][:state].gsub(/'/, "''") + "'"
end
@query += " ORDER BY created_at DESC LIMIT 250"
@messages = Message.find_by_sql(@query)
end
end
2 changes: 1 addition & 1 deletion app/controllers/notifications_controller.rb
View file
Expand Up @@ -86,7 +86,7 @@ def destroy
format.xml { head :ok }
end
end

def confirm
# Parameters: {"AccountSid"=>"AC6524b76ade95cfec0c693cc0c53b7176",
# "From"=>"+18122141761", "SmsStatus"=>"sent", "To"=>"+18123500093",
Expand Down
11 changes: 6 additions & 5 deletions app/models/acknowledgment.rb
View file
Expand Up @@ -42,6 +42,7 @@ def suppressionate # Named wierdly to keep from monkey-patching "suppress"
code = text[0..2]

sender = Channel.find_by_address(from).contact.username unless from.nil?
logger.error("Acknowledged by `#{sender}'...")

if m = code.match(/^Op([0-9])$/)
url = "/open" + m[1]
Expand Down Expand Up @@ -82,7 +83,7 @@ def suppressionate # Named wierdly to keep from monkey-patching "suppress"
notification.acknowledge!

# Need to send an ack to the Nagios server, which will in turn send out another
# notification that the problem has been ack'd. Will this get throttled?...
# notification that the problem has been ack'd. Will those get throttled?...
#
# cmd_typ=
# 22 service notifications on
Expand All @@ -99,12 +100,12 @@ def suppressionate # Named wierdly to keep from monkey-patching "suppress"
#
# wget -O - --http-user=username --http-password=password --post-data
# 'cmd_typ=34&cmd_mod=2&host=server_xyz&service=SSH&sticky_ack=on&
# send_notification=on&com_data=asdf&btnSubmit=Commit'
# send_notification=on&com_data=#{sender}&btnSubmit=Commit'
# http://nagios.internal.com/nagios3/cgi-bin/cmd.cgi
#
# wget -O - --no-check-certificate --http-user=username --http-password=password
# --post-data 'cmd_typ=55&cmd_mod=2&host=server_xyz&
# com_author=ComHub&com_data=ComHub%20was%20here&
# com_author=ComHub&com_data=#{sender}&
# start_time=2011-12-21%2009%3A50%3A00&
# end_time=2011-12-21%2011%3A50%3A00&
# fixed=0&hours=4&minutes=15&btnSubmit=Commit'
Expand All @@ -116,7 +117,7 @@ def suppressionate # Named wierdly to keep from monkey-patching "suppress"
if with_service
url = "/nagios3/cgi-bin/cmd.cgi?cmd_typ=56&cmd_mod=2&host=#{host}&" +
"service=#{service.gsub(/ /, "%20")}&" +
"com_author=ComHub&com_data=Comhub%20was%20here&" +
"com_author=ComHub&com_data=#{sender}&" +
"start_time=" + URI.escape(t.to_s(:db)) + "&" +
"end_time=" + URI.escape((t + 2.hours).to_s(:db)) + "&" +
"fixed=0&hours=" + blackout.to_s + "&minutes=0&btnSubmit=Commit"
Expand All @@ -133,7 +134,7 @@ def suppressionate # Named wierdly to keep from monkey-patching "suppress"
host = m[1]
if with_service
url = "/nagios3/cgi-bin/cmd.cgi?cmd_typ=55&cmd_mod=2&host=#{host}&" +
"com_author=ComHub&com_data=Comhub%20was%20here&" +
"com_author=ComHub&com_data=#{sender}&" +
"start_time=" + URI.escape(t.to_s(:db)) + "&" +
"end_time=" + URI.escape((t + 2.hours).to_s(:db)) + "&" +
"fixed=0&hours=" + blackout.to_s + "&minutes=0&btnSubmit=Commit"
Expand Down

0 comments on commit 7885ddf

Please sign in to comment.