Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(broker/bbdo):grpc_stream.proto is bad generated #1714

Open
wants to merge 1 commit into
base: dev-24.04.x
Choose a base branch
from
Open
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
26 changes: 13 additions & 13 deletions bbdo/bam.proto
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ enum State {
UNKNOWN = 3;
}

/*io::bam, bam::de_pb_inherited_downtime*/
/* io::bam, bam::de_pb_inherited_downtime, 31 */
message InheritedDowntime {
BBDOHeader header = 1;
uint32 ba_id = 2;
bool in_downtime = 3;
}

/*io::bam, bam::de_pb_ba_status*/
/* io::bam, bam::de_pb_ba_status, 32 */
message BaStatus {
uint32 ba_id = 1;
bool in_downtime = 2;
Expand All @@ -49,7 +49,7 @@ message BaStatus {
string output = 9;
}

/*io::bam, bam::de_pb_ba_event*/
/* io::bam, bam::de_pb_ba_event, 33 */
message BaEvent {
uint32 ba_id = 1;
double first_level = 2;
Expand All @@ -59,7 +59,7 @@ message BaEvent {
State status = 6;
}

/*io::bam, bam::de_pb_kpi_event*/
/* io::bam, bam::de_pb_kpi_event, 34 */
message KpiEvent {
uint32 ba_id = 1;
uint64 start_time = 2;
Expand All @@ -72,20 +72,20 @@ message KpiEvent {
State status = 9;
}

/*io::bam, bam::de_pb_dimension_bv_event*/
/* io::bam, bam::de_pb_dimension_bv_event, 35 */
message DimensionBvEvent {
uint32 bv_id = 1;
string bv_name = 2;
string bv_description = 3;
}

/*io::bam, bam::de_pb_dimension_ba_bv_relation_event*/
/* io::bam, bam::de_pb_dimension_ba_bv_relation_event, 36 */
message DimensionBaBvRelationEvent {
uint32 ba_id = 1;
uint32 bv_id = 2;
}

/*io::bam, bam::de_pb_dimension_timeperiod*/
/* io::bam, bam::de_pb_dimension_timeperiod, 37 */
message DimensionTimeperiod {
uint32 id = 1;
string name = 2;
Expand All @@ -98,7 +98,7 @@ message DimensionTimeperiod {
string sunday = 9;
}

/*io::bam, bam::de_pb_dimension_ba_event*/
/* io::bam, bam::de_pb_dimension_ba_event, 38 */
message DimensionBaEvent {
uint32 ba_id = 1;
string ba_name = 2;
Expand All @@ -109,7 +109,7 @@ message DimensionBaEvent {
uint32 sla_duration_warn = 7;
}

/*io::bam, bam::de_pb_dimension_kpi_event*/
/* io::bam, bam::de_pb_dimension_kpi_event, 39 */
message DimensionKpiEvent {
uint32 kpi_id = 1;
uint32 ba_id = 2;
Expand All @@ -129,7 +129,7 @@ message DimensionKpiEvent {
double impact_unknown = 16;
}

/*io::bam, bam::de_pb_kpi_status*/
/* io::bam, bam::de_pb_kpi_status, 40 */
message KpiStatus {
uint32 kpi_id = 1;
bool in_downtime = 2;
Expand All @@ -146,7 +146,7 @@ message KpiStatus {
bool valid = 13;
}

/*io::bam, bam::de_pb_ba_duration_event*/
/* io::bam, bam::de_pb_ba_duration_event, 41 */
message BaDurationEvent {
uint32 ba_id = 1;
int64 real_start_time = 2;
Expand All @@ -158,14 +158,14 @@ message BaDurationEvent {
bool timeperiod_is_default = 8;
}

/*io::bam, bam::de_pb_dimension_ba_timeperiod_relation*/
/* io::bam, bam::de_pb_dimension_ba_timeperiod_relation, 42 */
message DimensionBaTimeperiodRelation {
uint32 ba_id = 1;
uint32 timeperiod_id = 2;
bool is_default = 3;
}

/*io::bam, bam::de_pb_dimension_truncate_table_signal*/
/* io::bam, bam::de_pb_dimension_truncate_table_signal, 43 */
message DimensionTruncateTableSignal {
bool update_started = 1;
}
3 changes: 2 additions & 1 deletion bbdo/bam_state.proto
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ package com.centreon.broker;
* @brief Stores needed information for bool_service or kpi_service. Very useful
* when broker is stopped to save the BA's states.
*/
/* Ignore */
message ServiceState {
uint64 host_id = 1;
uint64 service_id = 2;
Expand All @@ -40,7 +41,7 @@ message ServiceState {
* @brief This message contains the living informations of the current BA's.
* Thanks to them we can recompute their states when Broker is restarted.
*/
/*io::bam, bam::de_pb_services_book_state*/
/* io::bam, bam::de_pb_services_book_state, 48 */
message ServicesBookState {
repeated ServiceState service = 1;
}
8 changes: 4 additions & 4 deletions bbdo/bbdo.proto
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@ syntax = "proto3";

package com.centreon.broker;


/* Ignore */
message Bbdo {
uint32 major = 1;
uint32 minor = 2;
uint32 patch = 3;
}

/*io::bbdo, bbdo::de_welcome*/
/* io::bbdo, bbdo::de_welcome, 49 */
message Welcome {
Bbdo version = 1;
string extensions = 2;
uint64 poller_id = 3;
string poller_name = 4;
}

/*io::bbdo, bbdo::de_pb_ack*/
/* io::bbdo, bbdo::de_pb_ack, 50 */
message Ack {
uint32 acknowledged_events = 1;
}

/*io::bbdo, bbdo::de_pb_stop*/
/* io::bbdo, bbdo::de_pb_stop, 51 */
message Stop {
uint64 poller_id = 1;
}
4 changes: 2 additions & 2 deletions bbdo/extcmd.proto
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import "google/protobuf/timestamp.proto";
package com.centreon.broker;



/* Ignore */
message TimePoint {
string name = 1;
string function = 2;
Expand All @@ -36,7 +36,7 @@ message TimePoint {
* from engine to dest with several timepoints (one per muxer)
*
*/
/*io::extcmd, extcmd::de_pb_bench*/
/* io::extcmd, extcmd::de_pb_bench, 3 */
message Bench {
uint32 id = 1;
repeated TimePoint points = 2;
Expand Down
48 changes: 24 additions & 24 deletions bbdo/neb.proto
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ enum AckType {
STICKY = 2;
}

/*io::neb, neb::de_pb_service*/
/* io::neb, neb::de_pb_service, 5 */
message Service {
uint64 host_id = 1;
uint64 service_id = 2;
Expand Down Expand Up @@ -159,7 +159,7 @@ message Service {
/**
* @brief Message sent in BBDO 3.0.0 instead of neb::service_status
*/
/*io::neb, neb::de_pb_service_status*/
/* io::neb, neb::de_pb_service_status, 6 */
message ServiceStatus {
uint64 host_id = 1;
uint64 service_id = 2;
Expand Down Expand Up @@ -226,7 +226,7 @@ message ServiceStatus {
*
* Only used with BBDO 3.0
*/
/*io::neb, neb::de_pb_adaptive_service*/
/* io::neb, neb::de_pb_adaptive_service, 7 */
message AdaptiveService {
uint64 host_id = 1;
uint64 service_id = 2;
Expand All @@ -248,7 +248,7 @@ message AdaptiveService {
optional string notification_period = 17;
}

/*io::neb, neb::de_pb_host*/
/* io::neb, neb::de_pb_host, 8 */
message Host {
uint64 host_id = 1;

Expand Down Expand Up @@ -355,7 +355,7 @@ message Host {
/**
* @brief Message sent in BBDO 3.0.0 instead of neb::service_status
*/
/*io::neb, neb::de_pb_host_status*/
/* io::neb, neb::de_pb_host_status, 9 */
message HostStatus {
uint64 host_id = 1;

Expand Down Expand Up @@ -412,7 +412,7 @@ message HostStatus {
*
* Only used with BBDO 3.0
*/
/*io::neb, neb::de_pb_adaptive_host*/
/* io::neb, neb::de_pb_adaptive_host, 10 */
message AdaptiveHost {
uint64 host_id = 1;

Expand All @@ -433,7 +433,7 @@ message AdaptiveHost {
optional string notification_period = 16;
}

/*io::neb, neb::de_pb_comment*/
/* io::neb, neb::de_pb_comment, 11 */
message Comment {
BBDOHeader header = 1;

Expand Down Expand Up @@ -476,7 +476,7 @@ message Comment {
* @brief A downtime is applied on a resource when we don't want notifications
* concerning bad states on this resource.
*/
/*io::neb, neb::de_pb_downtime*/
/* io::neb, neb::de_pb_downtime, 12 */
message Downtime {
enum DowntimeType {
NOT_USED = 0;
Expand Down Expand Up @@ -504,7 +504,7 @@ message Downtime {
bool fixed = 18;
}

/*io::neb, neb::de_pb_custom_variable*/
/* io::neb, neb::de_pb_custom_variable, 13 */
message CustomVariable {
enum VarType {
HOST = 0;
Expand All @@ -529,7 +529,7 @@ enum CheckType {
CheckPassive = 1;
}

/*io::neb, neb::de_pb_host_check*/
/* io::neb, neb::de_pb_host_check, 14 */
message HostCheck {
BBDOHeader header = 1;

Expand All @@ -540,7 +540,7 @@ message HostCheck {
uint64 next_check = 6;
}

/*io::neb, neb::de_pb_service_check*/
/* io::neb, neb::de_pb_service_check, 15 */
message ServiceCheck {
BBDOHeader header = 1;

Expand All @@ -552,7 +552,7 @@ message ServiceCheck {
uint64 service_id = 7;
}

/*io::neb, neb::de_pb_log_entry*/
/* io::neb, neb::de_pb_log_entry, 16 */
message LogEntry {
enum LogType {
SOFT = 0;
Expand Down Expand Up @@ -590,7 +590,7 @@ message LogEntry {
int32 retry = 13;
}

/*io::neb, neb::de_pb_instance_status*/
/* io::neb, neb::de_pb_instance_status, 17 */
message InstanceStatus {
BBDOHeader header = 1;

Expand All @@ -612,7 +612,7 @@ message InstanceStatus {
uint64 instance_id = 17;
}

/*io::neb, neb::de_pb_instance*/
/* io::neb, neb::de_pb_instance, 18 */
message Instance {
BBDOHeader header = 1;

Expand All @@ -626,15 +626,15 @@ message Instance {
string version = 9;
}

/*io::neb, neb::de_pb_responsive_instance*/
/* io::neb, neb::de_pb_responsive_instance, 19 */
message ResponsiveInstance {
BBDOHeader header = 1;

uint64 poller_id = 2;
bool responsive = 3;
}

/*io::neb, neb::de_pb_acknowledgement*/
/* io::neb, neb::de_pb_acknowledgement, 20 */
message Acknowledgement {
uint64 host_id = 1;
uint64 service_id = 2;
Expand All @@ -654,7 +654,7 @@ message Acknowledgement {
uint32 state = 12;
}

/*io::neb, neb::de_pb_host_dependency*/
/* io::neb, neb::de_pb_host_dependency, 21 */
message HostDependency {
BBDOHeader header = 1;

Expand All @@ -667,7 +667,7 @@ message HostDependency {
string notification_failure_options = 8;
}

/*io::neb, neb::de_pb_service_dependency*/
/* io::neb, neb::de_pb_service_dependency, 22 */
message ServiceDependency {
BBDOHeader header = 1;

Expand All @@ -682,7 +682,7 @@ message ServiceDependency {
uint64 service_id = 10;
}

/*io::neb, neb::de_pb_host_group*/
/* io::neb, neb::de_pb_host_group, 23 */
message HostGroup {
BBDOHeader header = 1;

Expand All @@ -692,7 +692,7 @@ message HostGroup {
uint64 poller_id = 5;
}

/*io::neb, neb::de_pb_service_group*/
/* io::neb, neb::de_pb_service_group, 24 */
message ServiceGroup {
BBDOHeader header = 1;

Expand All @@ -702,7 +702,7 @@ message ServiceGroup {
uint64 poller_id = 5;
}

/*io::neb, neb::de_pb_host_group_member*/
/* io::neb, neb::de_pb_host_group_member, 25 */
message HostGroupMember {
BBDOHeader header = 1;

Expand All @@ -713,7 +713,7 @@ message HostGroupMember {
uint64 poller_id = 6;
}

/*io::neb, neb::de_pb_service_group_member*/
/* io::neb, neb::de_pb_service_group_member, 26 */
message ServiceGroupMember {
BBDOHeader header = 1;

Expand All @@ -725,7 +725,7 @@ message ServiceGroupMember {
uint64 service_id = 7;
}

/*io::neb, neb::de_pb_host_parent*/
/* io::neb, neb::de_pb_host_parent, 27 */
message HostParent {
BBDOHeader header = 1;

Expand All @@ -734,7 +734,7 @@ message HostParent {
uint64 parent_id = 4;
}

/*io::neb, neb::de_pb_instance_configuration*/
/* io::neb, neb::de_pb_instance_configuration, 28 */
message InstanceConfiguration {
BBDOHeader header = 1;
bool loaded = 2;
Expand Down
Loading