github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

modified files

pull/1097/head
Rhythm 2022-01-05 15:21:50 +05:30
parent 7f73808065
commit fb0b03bb37
3 changed files with 12 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
handlers/routes.go
View File

@ -131,7 +131,7 @@ func Router() *mux.Router {
// API SERVICE Routes // API SERVICE Routes
api.Handle("/api/services", scoped(apiAllServicesHandler)).Methods("GET") api.Handle("/api/services", scoped(apiAllServicesHandler)).Methods("GET")
api.Handle("/api/services/status", scoped(apiAllServicesStatusHandler)).Methods("GET") api.Handle("/api/services/status", authenticated(apiAllServicesStatusHandler,false)).Methods("GET")
api.Handle("/api/services", authenticated(apiCreateServiceHandler, false)).Methods("POST") api.Handle("/api/services", authenticated(apiCreateServiceHandler, false)).Methods("POST")
api.Handle("/api/services/{id}", authenticatedV2(apiServiceHandler)).Methods("GET") api.Handle("/api/services/{id}", authenticatedV2(apiServiceHandler)).Methods("GET")
api.Handle("/api/services/{id}/sub_services", scoped(apiAllSubServicesHandler)).Methods("GET") api.Handle("/api/services/{id}/sub_services", scoped(apiAllSubServicesHandler)).Methods("GET")

17
handlers/services.go
View File

@ -1,7 +1,6 @@
package handlers package handlers
import ( import (
"encoding/json"
"fmt" "fmt"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/statping/statping/database" "github.com/statping/statping/database"
@ -552,7 +551,7 @@ func apiAllServicesHandler(r *http.Request) interface{} {
return srvs return srvs
} }
func apiAllServicesStatusHandler(r *http.Request) interface{} { func apiAllServicesStatusHandler(w http.ResponseWriter, r *http.Request){
query := r.URL.Query() query := r.URL.Query()
var t string var t string
if query.Get("time") != "" { if query.Get("time") != "" {
@ -568,18 +567,14 @@ func apiAllServicesStatusHandler(r *http.Request) interface{} {
if !v.Public.Bool && !IsUser(r) { if !v.Public.Bool && !IsUser(r) {
continue continue
} }
serviceJson, _ := json.Marshal(&v) var serviceDowntimeVar services.ServiceWithDowntime
var serviceDowntimeMap map[string]interface{} serviceDowntimeVar.Service = v
json.Unmarshal(serviceJson, &serviceDowntimeMap)
jsonString, _ := json.Marshal(serviceDowntimeMap)
serviceDowntime := services.ServiceWithDowntime{}
json.Unmarshal(jsonString, &serviceDowntime)
if vv, ok := m[v.Id]; ok == true { if vv, ok := m[v.Id]; ok == true {
serviceDowntime.Downtime = vv serviceDowntimeVar.Downtime = &vv
} }
srvs = append(srvs, serviceDowntime) srvs = append(srvs, serviceDowntimeVar)
} }
return srvs sendJsonAction(srvs, "fetch", w, r)
} }
func apiAllSubServicesHandler(r *http.Request) interface{} { func apiAllSubServicesHandler(r *http.Request) interface{} {

72
types/services/struct.go
View File

@ -12,6 +12,11 @@ import (
"time" "time"
) )
type ServiceWithDowntime struct {
Service
Downtime *downtimes.Downtime `gorm:"-" json:"downtime" yaml:"-"`
}
// Service is the main struct for Services // Service is the main struct for Services
type Service struct { type Service struct {
Id int64 `gorm:"primary_key;column:id" json:"id" yaml:"id"` Id int64 `gorm:"primary_key;column:id" json:"id" yaml:"id"`
@ -79,73 +84,6 @@ type Service struct {
ManualDowntime bool `gorm:"default:false;column:manual_downtime" json:"manual_downtime"` ManualDowntime bool `gorm:"default:false;column:manual_downtime" json:"manual_downtime"`
} }
type ServiceWithDowntime struct {
Id int64 `gorm:"primary_key;column:id" json:"id" yaml:"id"`
Name string `gorm:"column:name" json:"name" yaml:"name"`
Description string `gorm:"column:description" json:"description" yaml:"-"`
DisplayName string `json:"display_name"`
Domain string `gorm:"column:domain" json:"domain" yaml:"domain" private:"true" scope:"user,admin"`
Expected null.NullString `gorm:"column:expected" json:"expected" yaml:"expected" scope:"user,admin"`
ExpectedStatus int `gorm:"default:200;column:expected_status" json:"expected_status" yaml:"expected_status" scope:"user,admin"`
Interval int `gorm:"default:30;column:check_interval" json:"check_interval" yaml:"check_interval"`
Type string `gorm:"column:check_type" json:"type" yaml:"type"`
Method string `gorm:"column:method" json:"method" scope:"user,admin" yaml:"method"`
PostData null.NullString `gorm:"column:post_data" json:"post_data" scope:"user,admin" yaml:"post_data"`
Port int `gorm:"not null;column:port" json:"port" scope:"user,admin" yaml:"port"`
Timeout int `gorm:"default:30;column:timeout" json:"timeout" scope:"user,admin" yaml:"timeout"`
Order int `gorm:"default:0;column:order_id" json:"order_id" yaml:"order_id"`
Ftc int `gorm:"default:3;column:ftc" json:"ftc" yaml:"ftc"`
VerifySSL null.NullBool `gorm:"default:false;column:verify_ssl" json:"verify_ssl" scope:"user,admin" yaml:"verify_ssl"`
GrpcHealthCheck null.NullBool `gorm:"default:false;column:grpc_health_check" json:"grpc_health_check" scope:"user,admin" yaml:"grpc_health_check"`
Public null.NullBool `gorm:"default:true;column:public" json:"public" yaml:"public"`
GroupId int `gorm:"default:0;column:group_id" json:"group_id" yaml:"group_id"`
TLSCert null.NullString `gorm:"column:tls_cert" json:"tls_cert" scope:"user,admin" yaml:"tls_cert"`
TLSCertKey null.NullString `gorm:"column:tls_cert_key" json:"tls_cert_key" scope:"user,admin" yaml:"tls_cert_key"`
TLSCertRoot null.NullString `gorm:"column:tls_cert_root" json:"tls_cert_root" scope:"user,admin" yaml:"tls_cert_root"`
Headers null.NullString `gorm:"column:headers" json:"headers" scope:"user,admin" yaml:"headers"`
Permalink null.NullString `gorm:"column:permalink" json:"permalink" yaml:"permalink"`
Redirect null.NullBool `gorm:"default:false;column:redirect" json:"redirect" scope:"user,admin" yaml:"redirect"`
SubServicesDetails SubServicesDetail `gorm:"column:sub_services_detail;type:json;DEFAULT:null" json:"sub_services_detail" yaml:"sub_services_detail"`
CreatedAt time.Time `gorm:"column:created_at" json:"created_at" yaml:"-"`
UpdatedAt time.Time `gorm:"column:updated_at" json:"updated_at" yaml:"-"`
Online bool `gorm:"column:online" json:"online" yaml:"-"`
Latency int64 `gorm:"-" json:"latency" yaml:"-"`
PingTime int64 `gorm:"-" json:"ping_time" yaml:"-"`
Online24Hours float32 `gorm:"-" json:"online_24_hours" yaml:"-"`
Online7Days float32 `gorm:"-" json:"online_7_days" yaml:"-"`
AvgResponse int64 `gorm:"-" json:"avg_response" yaml:"-"`
FailuresLast24Hours int `gorm:"-" json:"failures_24_hours" yaml:"-"`
Running chan bool `gorm:"-" json:"-" yaml:"-"`
Checkpoint time.Time `gorm:"-" json:"-" yaml:"-"`
SleepDuration time.Duration `gorm:"-" json:"-" yaml:"-"`
LastResponse string `gorm:"-" json:"-" yaml:"-"`
NotifyAfter int64 `gorm:"column:notify_after" json:"notify_after" yaml:"notify_after" scope:"user,admin"`
AllowNotifications null.NullBool `gorm:"default:true;column:allow_notifications" json:"allow_notifications" yaml:"allow_notifications" scope:"user,admin"`
UpdateNotify null.NullBool `gorm:"default:true;column:notify_all_changes" json:"notify_all_changes" yaml:"notify_all_changes" scope:"user,admin"` // This Variable is a simple copy of `core.CoreApp.UpdateNotify.Bool`
DownText string `gorm:"-" json:"-" yaml:"-"` // Contains the current generated Downtime Text // Is 'true' if the user has already be informed that the Services now again available // Is 'true' if the user has already be informed that the Services now again available
LastStatusCode int `gorm:"-" json:"status_code" yaml:"-"`
LastLookupTime int64 `gorm:"-" json:"-" yaml:"-"`
LastLatency int64 `gorm:"-" json:"-" yaml:"-"`
LastCheck time.Time `gorm:"column:last_check" json:"last_check" yaml:"-"`
LastOnline time.Time `gorm:"column:last_success" json:"last_success" yaml:"-"`
LastOffline time.Time `gorm:"column:last_error" json:"last_error" yaml:"-"`
Stats *Stats `gorm:"-" json:"stats,omitempty" yaml:"-"`
Messages []*messages.Message `gorm:"foreignkey:service;association_foreignkey:id" json:"messages,omitempty" yaml:"messages"`
Incidents []*incidents.Incident `gorm:"foreignkey:service;association_foreignkey:id" json:"incidents,omitempty" yaml:"incidents"`
Checkins []*checkins.Checkin `gorm:"foreignkey:service;association_foreignkey:id" json:"checkins,omitempty" yaml:"-" scope:"user,admin"`
Failures []*failures.Failure `gorm:"-" json:"failures,omitempty" yaml:"-" scope:"user,admin"`
LastProcessingTime time.Time `gorm:"column:last_processing_time" json:"-"`
notifyAfterCount int64 `gorm:"column:notify_after_count" yaml:"-"`
prevOnline bool `gorm:"column:prev_online" yaml:"-"`
FailureCounter int `gorm:"column:failure_counter" json:"-" yaml:"-"`
CurrentDowntime int64 `gorm:"column:current_downtime" json:"-" yaml:"-"`
LastFailureType string `gorm:"-" json:"-" yaml:"-"`
ManualDowntime bool `gorm:"default:false;column:manual_downtime" json:"manual_downtime"`
Downtime downtimes.Downtime `gorm:"-" json:"downtime" yaml:"-"`
}
// ServiceOrder will reorder the services based on 'order_id' (Order) // ServiceOrder will reorder the services based on 'order_id' (Order)
type ServiceOrder []Service type ServiceOrder []Service