Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions ydb/core/mon/events_internal.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#pragma once

#include <ydb/core/protos/mon.pb.h>

namespace NMonitoring::NPrivate {

struct TEvMon {
enum {
EvBegin = EventSpaceBegin(NActors::TEvents::ES_PRIVATE),

EvMonitoringRequest = EvBegin,
EvMonitoringResponse,
EvRegisterHandler,
EvMonitoringCancelRequest,
EvCleanupProxy,

End
};

static_assert(End < EventSpaceEnd(NActors::TEvents::ES_PRIVATE), "expect End < EventSpaceEnd(TEvents::ES_PRIVATE)");

struct TEvMonitoringRequest : NActors::TEventPB<TEvMonitoringRequest, NKikimrMonProto::TEvMonitoringRequest, EvMonitoringRequest> {
TEvMonitoringRequest() = default;
};

struct TEvMonitoringResponse : NActors::TEventPB<TEvMonitoringResponse, NKikimrMonProto::TEvMonitoringResponse, EvMonitoringResponse> {
TEvMonitoringResponse() = default;
};

struct TEvRegisterHandler : NActors::TEventLocal<TEvRegisterHandler, EvRegisterHandler> {
NActors::TMon::TRegisterHandlerFields Fields;

TEvRegisterHandler(const NActors::TMon::TRegisterHandlerFields& fields)
: Fields(fields)
{}
};

struct TEvMonitoringCancelRequest : NActors::TEventPB<TEvMonitoringCancelRequest, NKikimrMonProto::TEvMonitoringCancelRequest, EvMonitoringCancelRequest> {
TEvMonitoringCancelRequest() = default;
};

struct TEvCleanupProxy : NActors::TEventLocal<TEvCleanupProxy, EvCleanupProxy> {
TString Address;

TEvCleanupProxy(const TString& address)
: Address(address)
{}
};
};

} // namespace NMonitoring::NPrivate
44 changes: 2 additions & 42 deletions ydb/core/mon/mon.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "mon.h"
#include "mon_impl.h"
#include "events_internal.h"
#include "counters_adapter_impl.h"

#include <ydb/core/base/appdata.h>
Expand Down Expand Up @@ -32,51 +33,10 @@

namespace NActors {

struct TEvMon {
enum {
EvMonitoringRequest = NActors::NMon::HttpInfo + 10,
EvMonitoringResponse,
EvRegisterHandler,
EvMonitoringCancelRequest,
EvCleanupProxy,
End
};

static_assert(EvMonitoringRequest > NMon::End, "expect EvMonitoringRequest > NMon::End");
static_assert(End < EventSpaceEnd(NActors::TEvents::ES_MON), "expect End < EventSpaceEnd(NActors::TEvents::ES_MON)");

struct TEvMonitoringRequest : TEventPB<TEvMonitoringRequest, NKikimrMonProto::TEvMonitoringRequest, EvMonitoringRequest> {
TEvMonitoringRequest() = default;
};

struct TEvMonitoringResponse : TEventPB<TEvMonitoringResponse, NKikimrMonProto::TEvMonitoringResponse, EvMonitoringResponse> {
TEvMonitoringResponse() = default;
};

struct TEvRegisterHandler : TEventLocal<TEvRegisterHandler, EvRegisterHandler> {
TMon::TRegisterHandlerFields Fields;

TEvRegisterHandler(const TMon::TRegisterHandlerFields& fields)
: Fields(fields)
{}
};

struct TEvMonitoringCancelRequest : TEventPB<TEvMonitoringCancelRequest, NKikimrMonProto::TEvMonitoringCancelRequest, EvMonitoringCancelRequest> {
TEvMonitoringCancelRequest() = default;
};

struct TEvCleanupProxy : TEventLocal<TEvCleanupProxy, EvCleanupProxy> {
TString Address;

TEvCleanupProxy(const TString& address)
: Address(address)
{}
};
};

namespace {

using namespace NKikimr;
using namespace NMonitoring::NPrivate;

bool HasJsonContent(NHttp::THttpIncomingRequest* request) {
if (request->Method == "POST") {
Expand Down
Loading
Loading