webroar 0.4.0 → 0.5.0

data/CHANGELOG

@@ -1,10 +1,47 @@
+v0.5.0 - 16-Feb-2011
+--------------------
+
+New Features
+~~~~~~~~~~~~
+
+* Added support to filter out know exceptions.
+* The number of exceptions displayed in exception list made configurable.
+* Support gzip encoding for static assets.
+* Support for adding/removing applications from its root directory with 
+default parameters.
+
+Fixes
+~~~~~
+* Support to render static assets for Rails 3 application.
+* Updated test cases.
+* Implemented new YAML parser to handle lists and associative arrays.
+* Added client side validations on Admin Panel.
+* Code clean-up in Admin Panel.
+* Corrected rendering of graph partials.
+* Improve popup windows used to display help messages.
+* Corrected checkbox selection functionality on exception listing page.
+* Check Cache-Control header before choosing encoding. This fixes an issue of 
+static content encoding on IE6.
+* Update values on Admin Panel home page using single Ajax request.
+* Wrapped multi statement macros in do..while structure.
+* Fixed rack dependency issue.
+* Improve the logic of exiting worker gracefully if there is an error.
+* Fixed starling dependency issue with Rails 3 application.
+* Kept strict dependency for Rspec 1.3.x.
+* Fixed QUERY_STRING issue faced with Rails 3 application.
+* Clean-up and improve migration scripts.
+* Updated libyaml to v0.1.3
+* Upgraded Libev to v3.9.
+* Improved Ajax call on Analytics page.
+
+
 v0.4.0 - 09-Aug-2010
 --------------------
 
 New Features
 ~~~~~~~~~~~~
 
-* Supports deflat encoding for static assets.
+* Supports deflate encoding for static assets.
 * Support for passing environment variables to application.
 * Support to build server with static Ruby library.
 
@@ -42,7 +79,7 @@ for the application which has analytics enabled.
 * Wait for 30 minutes before creating new worker, if three consecutive newly 
 created worker got timed out.
 * Removed 'Cache-Control' response header from static assets. Its incorrect 
-handling chocking IE 6.
+handling choking IE 6.
 
 
 v0.3.1 - 22-Mar-2010

data/conf/server_internal_config.yml

@@ -17,22 +17,22 @@ webroar_analyzer_script:
 
 ## Application Configuration ##
 Application:
-  message_queue_size: 2048  # Queue size of pending requests for each application. Default is 2048
-  maximum_request_ratio: 1  # Ratio of pending requests to active workes to create new worker. Default is 1
-  minimum_request_ratio: 3  # Ratio of pending requests to active workes to destroy free worker. Default is 3
-  high_load_time: 2         # Number of seconds to check high load before creating new worker. Default is 2
-  low_load_time: 600        # Number of seconds to check low load before destroying free worker. Default is 600
-  maximum_hosts: 16         # Maximum number of hosts allowed. Default is 16
+  message_queue_size: 2048  # Queue size of pending requests for each application. Default value is 2048
+  maximum_request_ratio: 1  # Ratio of pending requests to active workes to create new worker. Default value is 1
+  minimum_request_ratio: 3  # Ratio of pending requests to active workes to destroy free worker. Default value is 3
+  high_load_time: 2         # Number of seconds to check high load before creating new worker. Default value is 2
+  low_load_time: 600        # Number of seconds to check low load before destroying free worker. Default value is 600
+  maximum_hosts: 16         # Maximum number of hosts allowed. Default value is 16
 
 ## Worker Configuration ##
 Worker:
-  maximum_request_body_size: 65536  # If the request body is larger than this size, use file to read/write request body. Default is 65536
-  maximum_workers: 20               # Maximum number of workers allowed. Default is 20
-  pending_workers: 10               # Maximum number of pending workers. Default is 10
-  add_trials: 3                     # Number of consecutive tries to add worker. Default is 3
-  add_wait: 1800                    # Number of seconds to wait for creating new worker, if all consecutive trials are failed. Default is 1800
-  add_timeout: 25                   # Number of seconds to wait for a response form newly created worker. Default is 25. Set value to 0 to disable add timeout.
-  kill_timeout: 10                  # Number of seconds to wait before killing stucked worker. Default is 10
-  idle_time: 60                     # If worker is unable to process request within this time, send PING signal. Default is 60. Set value to 0 to disable idle timer.
-  ping_timeout: 15                  # Number of seconds to wait for a response of PING signal. Default is 15
-  ping_trials: 2                    # Number of PING signals to identify stuck workers. Default is 2  
+  maximum_request_body_size: 65536  # If the request body is larger than this size, use file to read/write request body. Default value is 65536
+  maximum_workers: 20               # Maximum number of workers allowed. Default value is 20
+  pending_workers: 10               # Maximum number of pending workers. Default value is 10
+  add_trials: 3                     # Number of consecutive tries to add worker. Default value is 3
+  add_wait: 1800                    # Number of seconds to wait for creating new worker, if all consecutive trials are failed. Default value is 1800
+  add_timeout: 25                   # Number of seconds to wait for a response form newly created worker. Default value is 25. Set value to 0 to disable add timeout.
+  kill_timeout: 10                  # Number of seconds to wait before killing identified stuck worker. Default value is 10
+  idle_time: 60                     # If worker is unable to process request within this time, sends PING signal. Default value is 60. Set value to 0 to disable idle timer.
+  ping_timeout: 15                  # Number of seconds to wait for a response of PING signal. Default value is 15
+  ping_trials: 2                    # Number of PING signals to identify stuck worker. Default value is 2  

data/lib/installer.rb

@@ -74,8 +74,8 @@ class Installer
 #         10) Run as user (mandatory)
 #         11) Hostnames(optional)
 #         12) Environment Variable(optional)
-#             It defines environment variables which can be used in the deployed application. It take following parameter.
-#               I) set_env(optional)(Value is key-value pair separated by equal sign('=') e.g. LOG_DIR=/var/log/webroar)             
+#             It defines list of environment variables which can be used in the deployed application. It take following parameter.
+#             Value is key-value pair separated by equal sign('=') e.g. LOG_DIR=/var/log/webroar
 #        Order of the above elements does not matter.
 #        Base-uri 'admin-panel' is reserved for 'Admin Panel'.
 #        Either host_names or baseuri(not both) must present to resolve HTTP request.
@@ -95,8 +95,8 @@ class Installer
 #              max_worker: 5
 #              log_level: SEVERE
 #              environment_variables: 
-#                - set_env: LOG_DIR=/var/log/webroar
-#                - set_env: TMP_DIR=/tmp
+#                - LOG_DIR=/var/log/webroar
+#                - TMP_DIR=/tmp
 #        Example with host_names:
 #          Application Specification:
 #            - name: Mephisto

data/lib/webroar_command.rb

@@ -48,9 +48,17 @@ class WebroarCommand
   # Stop and remove the application
   def remove(args)
     return unless CheckUser.check
+    rails_app = false
+    rack_app =false
     if args.length < 2
-      puts "Application name is missing."
-      return
+      if File.exists?(File.join(Dir.getwd, "config", "environment.rb"))
+        rails_app = true
+      elsif File.exists?(File.join(Dir.getwd, "config.ru")) 
+        rack_app = true
+      else
+        puts "Application name is missing."
+        return
+      end      
     end
 
 #    gem 'activesupport', '>= 2.3.5'
@@ -66,6 +74,7 @@ class WebroarCommand
 
     load_files(files)
 
+    args[1] = Dir.pwd.match(/[^\/]*$/).to_s if(args[1] == nil and (rails_app or rack_app ))
     reply, err_log = App.stop(args[1])
     ApplicationSpecification::remove(args[1]) if reply.nil?
     
@@ -77,9 +86,18 @@ class WebroarCommand
   # Add and start the application
   def add(options, args)
     return unless CheckUser.check
+    rails_app = false
+    rack_app = false
+    
     if args.length < 2
-      puts "Application name is missing."
-      return
+      if File.exists?(File.join(Dir.getwd, "config", "environment.rb"))
+        rails_app = true
+      elsif File.exists?(File.join(Dir.getwd, "config.ru")) 
+        rack_app = true
+      else
+        puts "Application name is missing."
+        return
+      end      
     end
 
     sockFile = File.join("","tmp","webroar.sock")
@@ -102,6 +120,21 @@ class WebroarCommand
     files << File.join(ADMIN_PANEL_ROOT, 'lib','yaml_writer.rb')
     load_files(files)
     
+    args[1] = Dir.pwd.match(/[^\/]*$/).to_s if(args[1] == nil and (rails_app or rack_app ))
+    options[:path] = Dir.pwd if(options[:path] == nil and (rails_app or rack_app ))
+    options[:resolver] = ("/" << args[1].gsub(/[^a-zA-Z0-9_\-.~]/,'_').downcase) if(options[:resolver] == nil and (rails_app or rack_app ))
+    options[:type1] = "Rack" if (options[:type1] == nil and rack_app)
+    options[:run_as_user] = Etc.getpwuid(File.stat(File.join(Dir.getwd, "config", "environment.rb")).uid).name if(options[:run_as_user] == nil and rails_app)
+    options[:run_as_user] = Etc.getpwuid(File.stat(File.join(Dir.getwd, "config.ru")).uid).name if(options[:run_as_user] == nil and rack_app)
+    
+    if(!options[:min_worker] or !options[:max_worker])
+      info = YAML::load_file(CONFIG_FILE_PATH)
+      if info
+        options[:min_worker] = info['Server Specification']['min_worker'].to_i unless options[:min_worker] 
+        options[:max_worker] = info['Server Specification']['max_worker'].to_i unless options[:max_worker]
+      end
+    end
+      
     params = {:app_id => nil,
       :name => args[1],
       :host_names => nil,

data/src/admin_panel/app/controllers/admin_controller.rb

@@ -21,7 +21,8 @@
 #This controller deals with all the actions related to the user handling and application configuration. 
 class AdminController < ApplicationController
   before_filter :login_required, :except => ['index', 'login'] #This method checks whether user is authenticated or not.
-  before_filter :check_session_timeout, :except => ['index', 'login', 'get_latest_app_cpu_usage', 'get_latest_app_memory_usage', 'get_latest_server_cpu_usage', 'get_latest_server_memory_usage', 'get_latest_time']
+  before_filter :check_session_timeout, :except => ['index', 'login', 'get_latest_updates', 'get_latest_time']
+  before_filter :clear_flash_notice, :only => [:change_password_form]
   #before_filter :clear_flash_notice #This methos clear the flash notice messages before navigating to next action.
   protect_from_forgery :only => [:change_password ]
   ssl_required :index, :login, :change_password, :change_password_form if SSL_ON
@@ -47,44 +48,11 @@ class AdminController < ApplicationController
     set_application_name
   end
   
-  # This function is to dynamically update the server's CPU usage.
-  # After a minute it refreshes the cpu usage. 
-  def get_latest_server_cpu_usage
-    render :text => ResourceUsage.get_latest_for_server[0] 
-  end
-  
-  # This function is to dynamically update the server's memory usage.
-  # After a minute it refreshes the memory usage of the server.
-  def get_latest_server_memory_usage
-    render :text => format("%.2f",ResourceUsage.get_latest_for_server[1]/1024.to_f)
-  end
-  
-  # This function is to dynamically update the application's CPU usage
-  # After a minute it refreshes the cpu usage for a particalar application.	
-  def get_latest_app_cpu_usage
-    apps_resource_usage = ResourceUsage.get_latest_for_apps
-    if params[:app_name] and apps_resource_usage[params[:app_name]]
-      render :text => apps_resource_usage[params[:app_name]][0].to_s
-    else
-      render :text => "0.0"
-    end
-  end
-  
-  # This function is to dynamically update the application's Memory usage.
-  # After a minute it refreshes the memory usage for a particalar application.	
-  def get_latest_app_memory_usage
-    apps_resource_usage = ResourceUsage.get_latest_for_apps
-    if params[:app_name] and apps_resource_usage[params[:app_name]]
-      render :text => format("%.2f",apps_resource_usage[params[:app_name]][1] / 1024.to_f)	
-    else
-      render :text => "0.0"
-    end
-  end
-  
   # This function is to get the details of config file for configuration page.
   # This page contains the server settings and the application settings.
   def configuration			
     @info= YAML::load_file(CONFIG_FILE_PATH)	rescue nil
+    @applications = App.get_all(1)
     @ssl_spec = Hash[:certificate_path => params[:ssl][:certificate_path],
       :key_path => params[:ssl][:key_path],
       :port => params[:ssl][:port]] if params[:ssl]
@@ -155,6 +123,23 @@ class AdminController < ApplicationController
     set_application_name
   end
   
+  #Update all the dynamic values on home page
+  def get_latest_updates
+    server_usage = ResourceUsage.get_latest_for_server
+    apps_usage = ResourceUsage.get_latest_for_apps_with_exceptions
+    str = "<script>
+        loadDivs(new Array('server_cpu_usage','#{"%.2f" % server_usage[0]}','server_memory_usage','#{"%.2f" % (server_usage[1].to_f/1024)}'"
+
+         apps_usage.each do |key, val|
+          unless key[" "] or key == 'static-worker'
+            str<<",'#{key}_cpu','#{"%.2f" % val[0]}','#{key}_memory','#{"%.2f" % (val[1].to_f/1024)}','#{key}_exception','#{val[2]}'"
+          end
+        end
+        str << "));</script>"
+
+    render :text => str
+  end
+
   #This method is to return the server time.
   #The method refreshes the time after every minute.	
   def get_latest_time
@@ -164,7 +149,10 @@ class AdminController < ApplicationController
   #Used to paginate the list of deployed applications.
   def required_apps
     @info = YAML::load_file(CONFIG_FILE_PATH)	rescue nil
-    render :partial => 'application_table', :locals => {:start => params[:start].to_i}
+    @applications = App.get_all(params[:page] || 1)
+    render :update do |page|
+      page.replace_html 'application_list_table', :partial => 'application_table'
+    end
   end
   
   private

data/src/admin_panel/app/controllers/exceptions_controller.rb

@@ -26,7 +26,8 @@ class ExceptionsController < ApplicationController
   
   #the method is to render the index page of exception tab.
   #on this page the exception of the first application in the application array is deiplayed.
-  def index
+  def index 
+    flash[:notice] = params[:notice] if params[:notice]
     @apps = get_application_list_for_exceptions
     session[:application_name] = get_application_list[0]
     if session[:exceptions_application_name].nil?
@@ -36,16 +37,15 @@ class ExceptionsController < ApplicationController
       app = session[:exceptions_application_name]
     end  
     @application_name = app
-    app_id = App.get_application_data(app).id rescue nil    
+    app_id = App.get_application_data(app).id rescue nil
     @size = AppException.count_open(app_id)
-    @exceptions = AppException.get_all(OPEN_EXCEPTION, app_id, params[:page] || 1)
+    session[:per_page] = 5 if not session[:per_page]
+    @exceptions = AppException.get_all(OPEN_EXCEPTION, app_id, params[:page] || 1,session[:per_page])
   end  
   
   #This method is to display the information of the specific exception.
-  def show
-    app_id = App.get_application_data(params[:app_name]).id
-    @excep = AppException.get_exception_details_by_id(params[:id])
-    @exceptions = AppException.get_exception_details_by_exception_message(@excep.exception_message, app_id)
+  def show    
+    @exception = AppException.first(:conditions => ["id = ?", params[:id]]) # found include bug with eager loading, its fetching all the associated records     
     render :partial => 'show', :locals => { :status_name => params[:status_name], :app_name => params[:app_name], :page => params[:page] }
   end
   
@@ -55,7 +55,8 @@ class ExceptionsController < ApplicationController
     session[:exceptions_application_name] = @application_name
     app_id = App.get_application_data(@application_name).id    
     @size = AppException.count_open(app_id)
-    @exceptions = AppException.get_all(OPEN_EXCEPTION, app_id, params[:page] || 1)
+    session[:per_page] = 5 if not session[:per_page]
+    @exceptions = AppException.get_all(OPEN_EXCEPTION, app_id, params[:page] || 1,session[:per_page])
     render :partial => 'exceptions_listing_partial'
   end
   
@@ -79,10 +80,11 @@ class ExceptionsController < ApplicationController
   
   #Method is used to list the exceptions with different status.
   def list_statuswise_exceptions
+    session[:per_page] = params[:per_page] if params[:per_page]     
     app_id = App.get_application_data(params[:app_name]).id
     @application_name = params[:app_name]
-    status = get_status_const(params[:status_name])      
-    @exceptions = AppException.get_all(status, app_id, params[:page] || 1)    
+    status = get_status_const(params[:status_name])
+    @exceptions = AppException.get_all(status, app_id, params[:page] || 1,session[:per_page])
     render :update do |page|
       page.replace_html 'data_div', :partial => 'exception_list_partial', :locals => { :current_status => status, :status_name => params[:status_name] }      
     end 
@@ -91,8 +93,8 @@ class ExceptionsController < ApplicationController
   #Method is used to update the status for selected exceptions.
   def change_status    
     if request.method == :put
-      @application_name = params[:app_name]
-      app_id = App.get_application_data(@application_name).id  
+      @application_name = params[:app_name]    
+      app_id = App.get_application_data(@application_name).id
       if params[:exception_ids] and params[:status_name]        
         params[:exception_ids].collect! do |e|
           e.to_i
@@ -101,17 +103,18 @@ class ExceptionsController < ApplicationController
           when 'delete'
             
           when 'ignore'
-            AppException.update_all_status_to(IGNORED_EXCEPTION, params[:exception_ids], app_id)
+            AppException.update_all_status_to(IGNORED_EXCEPTION, params[:exception_ids])
           when 'close'
-            AppException.update_all_status_to(CLOSED_EXCEPTION, params[:exception_ids], app_id)
+            AppException.update_all_status_to(CLOSED_EXCEPTION, params[:exception_ids])
           when 'open'
-            AppException.update_all_status_to(OPEN_EXCEPTION, params[:exception_ids], app_id)
+            AppException.update_all_status_to(OPEN_EXCEPTION, params[:exception_ids])
         end
       end
       status = get_status_const(params[:current_status])
-      @exceptions = AppException.get_all(status, app_id, params[:page])
+      session[:per_page] = 5 if not session[:per_page]
+      @exceptions = AppException.get_all(status, app_id, params[:page],session[:per_page])
       if @exceptions.out_of_bounds? and (page = params[:page].to_i - 1) > 0
-        @exceptions = AppException.get_all(status, app_id, page)
+        @exceptions = AppException.get_all(status, app_id, page,session[:per_page])
       end
       render :update do |page|
         page.replace_html 'data_div', :partial => 'exception_list_partial', :locals => { :current_status => status, :status_name => params[:current_status]}  
@@ -119,6 +122,42 @@ class ExceptionsController < ApplicationController
     end
   end
   
+  # This method is used to render the add_application_class_form partial with all the exception classes
+  # stored in configuration file, with respect to the selected application
+  def save_exception_class_form
+    if params[:app_name]
+      @exception_classes = AppException.get_exception_classes(params[:app_name])
+      render :partial => "add_exception_class_form" , :locals =>{:app_name => params[:app_name]}
+    else
+      error = "You have been redircted, because application name was missing"
+      redirect_to :action => 'index' ,:notice => error
+    end
+  end
+
+  # This method is used to fetch the app_id and exception_class from user and
+  # call the add_exception_class_in_config_file method to save the exception classes
+  def save_exception_class
+    if params[:app_name]
+      flash[:notice] = AppException.add_exception_class(params[:app_name],params[:exception][:class])
+      @exception_classes = AppException.get_exception_classes(params[:app_name])
+      render :partial => 'add_and_list_exception_classes', :locals => {:app_name => params[:app_name]}
+    else
+      error = "You have been redircted, because application name was missing"
+      redirect_to :action => 'index' ,:notice => error
+    end
+  end
+
+  # This method is used to remove the exception classes from configuration file
+  def delete_exception_class
+    if params[:app_name] and params[:exception_class]
+      @exception_classes = AppException.delete_exception_class_from_config(params[:app_name],params[:exception_class])
+      render :partial => 'add_and_list_exception_classes', :locals => {:app_name => params[:app_name]}
+    else
+      error = "You have been redircted, because application name and exception class were missing"
+      redirect_to :action => 'index' ,:notice => error
+    end
+  end
+
 private
   def get_status_const(status_name)
     case status_name.downcase
@@ -128,6 +167,8 @@ private
         status = CLOSED_EXCEPTION
       when 'ignored', 'ignore'
         status = IGNORED_EXCEPTION
-    end  
+      when 'permanently-ignored', 'permanently-ignore'
+        status = PERMANENTLY_IGNORED_EXCEPTION
+    end
   end
 end

data/src/admin_panel/app/controllers/graph_controller.rb

@@ -98,9 +98,9 @@ class GraphController < ApplicationController
         @suffix = get_suffix(@url_rank)
         @data_x,@data_y,@url_breakup_graph,@data_actual_time = get_url_breakup_graph_data(@start_time, @end_time, @app_id, @urls)       
       else
-        flash[:notice] = NO_URL_HITS
+        flash[:notice] = NO_DATA_FOUND
       end              
-      render :partial => 'url_breakup_graph'
+      render :partial => 'get_url_breakup_data'
     else
       render :text => rv, :status => 404
     end
@@ -113,10 +113,15 @@ class GraphController < ApplicationController
     rv = check_for_valid_period(from_date_str, to_date_str)
     if rv.class == Array  
       # check_for_valid_period method would set Time object having hour minute and second value to zero
-      # for entime we would change it 23:59:59  by adding 86399 seconds 
-      check_and_set_query_period(rv[0], rv[1] + 86399)      
-      @url_hits_graph, @slowest_url_graph, @time_consuming_url_graph, @db_consuming_url_graph = get_url_calls_graph(@app_id)
-      render :partial => 'url_calls_graph'      
+      # for entime we would change it 23:59:59  by adding 86399 seconds
+      check_and_set_query_period(rv[0], rv[1] + 86399)
+      urls = UrlTimeSample.get_urls(session[:from_date], session[:to_date], @app_id)      
+      if urls.size > 0               
+        @url_hits_graph, @slowest_url_graph, @time_consuming_url_graph, @db_consuming_url_graph = get_url_calls_graph(@app_id)
+      else
+        flash[:notice] = NO_DATA_FOUND
+      end
+      render :partial => 'get_url_data'      
     else
       render :text => rv, :status => 404
     end       
@@ -129,10 +134,16 @@ class GraphController < ApplicationController
     date_str = params[:date].strip
     rv = check_for_valid_query_date(date_str)
     if rv.class == Array
-      check_and_set_query_date(rv[0])      
-      @percentage_db_usage_graph = get_database_usage_graph(@app_id)
-      render :partial => 'database_usage_graph'
-      #puts @percentage_db_usage_graph      
+      check_and_set_query_date(rv[0])
+      start_date = session[:start_time].strftime("%Y-%m-%d")+" 00:00:00"
+      end_date = session[:start_time].strftime("%Y-%m-%d")+" 23:59:59"
+      urls = UrlTimeSample.get_urls(start_date, end_date, @app_id)      
+      if urls.size > 0              
+        @percentage_db_usage_graph = get_database_usage_graph(@app_id)  
+      else
+        flash[:notice] = NO_DATA_FOUND
+      end            
+      render :partial => 'get_database_data'           
     else
       render :text => rv, :status => 404
     end    
@@ -147,7 +158,7 @@ class GraphController < ApplicationController
     if rv.class == Array
       check_and_set_query_date(rv[0])      
       @app_cpu_usage_graph,@app_memory_usage_graph = get_resource_usage_graph_app(@app_id)
-      render :partial=> 'resource_usage_graph_app'      
+      render :partial=> 'get_resource_usage_data_app'      
     else
       render :text => rv, :status => 404
     end    
@@ -161,9 +172,16 @@ class GraphController < ApplicationController
     date_str = params[:date].strip
     rv = check_for_valid_query_date(date_str)
     if rv.class == Array
-      check_and_set_query_date(rv[0])      
-      @avg_res_time_graph,@app_throughput_graph = get_throughput_graph(@app_id)   
-      render :partial => 'throughput_graph'   
+      check_and_set_query_date(rv[0])
+      start_date = session[:start_time].strftime("%Y-%m-%d")+" 00:00:00"
+      end_date = session[:start_time].strftime("%Y-%m-%d")+" 23:59:59"
+      urls = UrlTimeSample.get_urls(start_date, end_date, @app_id)
+      if urls.size > 0             
+        @avg_res_time_graph,@app_throughput_graph = get_throughput_graph(@app_id)   
+      else
+        flash[:notice] = NO_DATA_FOUND
+      end      
+      render :partial => 'get_throughput_data'   
     else
       render :text => rv, :status => 404
     end
@@ -177,7 +195,7 @@ class GraphController < ApplicationController
     if rv.class == Array
       check_and_set_query_date(rv[0])      
       @server_cpu_usage_graph, @server_memory_usage_graph = get_resource_usage_graph_server()
-      render :partial => 'resource_usage_graph_server'
+      render :partial => 'get_resource_usage_data_server'
     else
       render :text => rv, :status => 404
     end    
@@ -409,9 +427,21 @@ class GraphController < ApplicationController
       @app_id = application.id
       case session[:graph_type]
       when "URL-Calls"
-        @url_hits_graph, @slowest_url_graph, @time_consuming_url_graph, @db_consuming_url_graph = get_url_calls_graph(@app_id)
+        urls = UrlTimeSample.get_urls(session[:from_date], session[:to_date], @app_id)
+        if urls.size > 0       
+          @url_hits_graph, @slowest_url_graph, @time_consuming_url_graph, @db_consuming_url_graph = get_url_calls_graph(@app_id)
+        else
+          flash[:notice] = NO_DATA_FOUND
+        end        
       when "Database-Usage"
-        @percentage_db_usage_graph = get_database_usage_graph(@app_id)
+        start_date = session[:start_time].strftime("%Y-%m-%d")+" 00:00:00"
+        end_date = session[:start_time].strftime("%Y-%m-%d")+" 23:59:59"
+        urls = UrlTimeSample.get_urls(start_date, end_date, @app_id)
+        if urls.size > 0
+          @percentage_db_usage_graph = get_database_usage_graph(@app_id)
+        else
+          flash[:notice] = NO_DATA_FOUND
+        end 
       when "URL-Breakup"
         @start_time = session[:from_date].strftime("%Y/%m/%d")
         start_time = session[:from_date]
@@ -424,7 +454,14 @@ class GraphController < ApplicationController
           @data_x, @data_y, @url_breakup_graph, @data_actual_time = get_url_breakup_graph_data(@start_time, @end_time, @app_id, @urls)
         end
       when "Throughput"
-        @avg_res_time_graph, @app_throughput_graph = get_throughput_graph(@app_id)
+        start_date = session[:start_time].strftime("%Y-%m-%d")+" 00:00:00"
+        end_date = session[:start_time].strftime("%Y-%m-%d")+" 23:59:59"
+        urls = UrlTimeSample.get_urls(start_date, end_date, @app_id)
+        if urls.size > 0
+          @avg_res_time_graph, @app_throughput_graph = get_throughput_graph(@app_id)
+        else
+          flash[:notice] = NO_DATA_FOUND
+        end         
       when "Resource-Usage"
         @app_cpu_usage_graph, @app_memory_usage_graph = get_resource_usage_graph_app(@app_id)
       else