-**Description**: {{ property.description }}
+**Description**: {% if '\n' in property.description %} {% endif %}{{ property.description }}
**Type**: `{{ property.type }}`
{% if "default" in property and property.default is not none and property.default != ""%} **Default value**: {{ property.default }}
diff --git a/docs/docs/development/backend.mdx b/docs/docs/development/backend.mdx index 0ef6f0e023..37f8895c65 100644 --- a/docs/docs/development/backend.mdx +++ b/docs/docs/development/backend.mdx @@ -11,7 +11,7 @@ In order start developing on Infrahub backend, it is recommended to have a decen * [Poetry](https://python-poetry.org/) to manage our Python virtual environment * [Docker](https://www.docker.com/) and its Compose extension to run dependencies such as the database, cache and queueing system -To fetch Infrahub's code, we will use git and we will use the `develop` branch. +To fetch Infrahub's code, we will use Git and we will use the `develop` branch. ```bash git clone git@github.com:opsmill/infrahub.git @@ -26,12 +26,12 @@ Most of Infrahub and tools around it rely on some settings. These settings are i ```bash export INFRAHUB_PRODUCTION=false export INFRAHUB_SECURITY_SECRET_KEY=super-secret -export INFRAHUB_SDK_USERNAME=admin -export INFRAHUB_SDK_PASSWORD=infrahub -export INFRAHUB_SDK_TIMEOUT=20 +export INFRAHUB_USERNAME=admin +export INFRAHUB_PASSWORD=infrahub +export INFRAHUB_TIMEOUT=20 export INFRAHUB_METRICS_PORT=8001 export INFRAHUB_DB_TYPE=neo4j # Accepts neo4j or memgraph -export INFRAHUB_SECURITY_INITIAL_ADMIN_TOKEN="${ADMIN_TOKEN}" # Random string which can be generated using: openssl rand -hex 16 +export INFRAHUB_INITIAL_ADMIN_TOKEN="${ADMIN_TOKEN}" # Random string which can be generated using: openssl rand -hex 16 export INFRAHUB_STORAGE_LOCAL_PATH="${HOME}/Development/infrahub-storage" export INFRAHUB_API_CORS_ALLOW_ORIGINS='["http://localhost:8080"]' # Allow frontend/backend communications without CORS issues export INFRAHUB_IMAGE_VER=local # Force building a local image instead of pulling one from the registry diff --git a/docs/docs/development/docs.mdx b/docs/docs/development/docs.mdx index 53e4c51100..1a84b4d31f 100644 --- a/docs/docs/development/docs.mdx +++ b/docs/docs/development/docs.mdx @@ -24,6 +24,7 @@ invoke -l docs The primary commands are as follows: +- `invoke docs.install`: Install the documentation dependencies via `npm`. - `invoke docs.build`: Build the documentation website. - `invoke docs.generate`: Generate source-derived documentation pages (such as the schema and Jinja templates). - `invoke docs.serve`: Run a local development server for the documentation website. diff --git a/docs/docs/development/editor.mdx b/docs/docs/development/editor.mdx index 7cec9d2a88..8cdfb32f85 100644 --- a/docs/docs/development/editor.mdx +++ b/docs/docs/development/editor.mdx @@ -18,7 +18,7 @@ More details coming soon - Jinja: https://marketplace.visualstudio.com/items?itemName=wholroyd.jinja - Pylance: https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance - Trailing Space: https://marketplace.visualstudio.com/items?itemName=shardulm94.trailing-spaces -- Better Toml: https://marketplace.visualstudio.com/items?itemName=bungcip.better-toml +- Even Better Toml: https://marketplace.visualstudio.com/items?itemName=tamasfe.even-better-toml - GraphQL: https://marketplace.visualstudio.com/items?itemName=GraphQL.vscode-graphql - Ruff: https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff diff --git a/docs/docs/development/frontend/readme.mdx b/docs/docs/development/frontend/readme.mdx index 5bc9120ed6..2a1c46b860 100644 --- a/docs/docs/development/frontend/readme.mdx +++ b/docs/docs/development/frontend/readme.mdx @@ -25,7 +25,7 @@ For testing, we rely on: ## Accessing the frontend code -To access Infrahub's codebase, use git and switch to the `develop` branch to access the latest changes. All frontend code resides in `/frontend`. +To access Infrahub's codebase, use Git and switch to the `develop` branch to access the latest changes. All frontend code resides in `/frontend`. ```bash git clone git@github.com:opsmill/infrahub.git diff --git a/docs/docs/faq/faq.mdx b/docs/docs/faq/faq.mdx new file mode 100644 index 0000000000..ffb9694f0c --- /dev/null +++ b/docs/docs/faq/faq.mdx @@ -0,0 +1,174 @@ +--- +title: FAQ +--- +# Frequently asked questions + +Here are the key details about Infrahub: + +## About Infrahub + +### What is Infrahub? + +Infrahub is an open-source platform that enables infrastructure as code by providing a unified system to model, store, version, validate, and generate infrastructure data and configurations. It acts as a centralized source of truth for all infrastructure resources across an organization. + +### What are the main features and capabilities? + +- User-Defined Schema: Build and update data models to support business requirements for infrastructure resources. +- Unified Storage: Version control for data and files +- Versioning: Track current state and future intended state of the infrastructure with built-in peer review and a CI pipeline for validation. +- Immutable Database: Go back in time to view the state of infrastructure at any point. +- Artifact Generation: Transform infrastructure data into any format (text configurations, XML, JSON, etc.) using generators and templates. +- Data Lineage: View the source and owner for each piece of infrastructure data. +- Multiple interfaces for each team and need: + - Web UI: View and manage all infrastructure data, configurations, and CI/CD pipelines through a user interface. + - Query Engine: Powerful API and support for GraphQL and REST to query and retrieve infrastructure data. +- Git Integration: File storage for code and templates +- Integrations: Integrations with tools like NetBox, Nautobot, Ansible, and Nornir. Ability to build custom integrations. +- Python SDK: Programmatically interact with Infrahub using a Python SDK. + +For more information, see our [Infrahub overview](../overview/). + +### I’m just getting started with infrastructure automation. Do I need Infrahub? + +If you're new to infrastructure automation, Infrahub can be a valuable tool to help you manage and automate your infrastructure resources without having to learn and assemble multiple automation tools into a workable system. + +It provides a centralized platform to define, version, and generate your infrastructure configurations, making it easier to achieve the goals of automation without the significant up-front effort. + +Please see our [Getting Started](../tutorials/getting-started/) tutorial to learn how to use Infrahub. + +### Where can I deploy Infrahub? + +You can test out Infrahub via [GitHub Codespaces](https://github.com/opsmill/infrahub#quick-start) + +Infrahub is a platform-agnostic solution that can be deployed in various environments, including: + +- Cloud platforms such as AWS, Azure, or GCP +- On-premises data centers +- Kubernetes clusters (via Helm charts) +- Docker containers (using Docker Compose) + +The specific system requirements may vary depending on the deployment environment and the scale of your infrastructure. + +In the future, we plan to offer a managed Cloud SaaS offering of Infrahub. Please [subscribe to our mailing list](https://opsmill.com) to stay updated. + +### Installation and deployment + +To install and set up Infrahub: + +1. Download the latest version of Infrahub from the [GitHub repository](https://github.com/opsmill/infrahub) +2. [Deploy](../guides/installation): Deploy Infrahub using the appropriate method for your environment such as Docker Compose, Helm charts + +Detailed installation guides and tutorials are available in [Installing Infrahub](../guides/installation) guide. + +### I deployed Infrahub, now what? + +After deploying Infrahub, you can start using it to manage your infrastructure resources. Here are some common initial steps: + +- [Load Schema](../topics/schema): Define your infrastructure data model by loading a schema into Infrahub. This schema will define the structure and relationships of your infrastructure resources. +- [Load Data](../overview/data.mdx): Populate Infrahub with your existing infrastructure data, either manually or by importing from other sources. +- Inventory: Use Infrahub's inventory capabilities to view and manage your infrastructure resources based on the loaded data. + +### How do I load my own schema into Infrahub? + +Infrahub allows you to load custom schemas to define your infrastructure data model. Currently, you can load schemas using the following methods: + +- [CLI and SDK](../topics/schema): Use the Infrahub command-line interface (CLI) or the Python SDK to load and manage schemas programmatically. +- Frontend (Coming Soon): A user-friendly web interface for managing schemas is planned for future releases. + +### What is the status of the project? + +Infrahub is currently in beta, and the team is actively working towards reaching version 1.0 by the end of the year. The project is committed to ensuring data safety and providing a migration path for future releases. + +Upcoming features and improvements include: + +- Scale and Performance: Enhancements to handle larger volumes of data and improve overall performance. +- Proposed Changes & CI Pipeline +- Resource Manager: A dedicated resource management module for better visibility and control over infrastructure resources. +- Profiles: Support for defining and managing different profiles or environments within Infrahub. + +### How much data can Infrahub handle right now? + +The current data handling capabilities of Infrahub are still being actively developed and tested. If you have specific requirements or want to assess Infrahub's performance and scalability in your environment, please reach out to the team at contact@opsmill.com or through the [Discord](https://discord.gg/jXMRp9hXSX) server. + +### Can I deploy Infrahub in production? + +Yes, Infrahub can be deployed in production but keep in mind we are still in beta so please ensure to have the right backup and safeguard in place. + +If you are planning to deploy Infrahub in a critical environment we recommend reaching out to our customer success team via [Discord](https://discord.gg/jXMRp9hXSX) or contact@opsmill.com + +### How can I get involved? + +We develop Infrahub for customers and with the community. There are a few different ways to get involved with Infrahub: + +- As you use Infrahub, please submit bugs and feature requests. +- Reach out to OpsMill on [Discord](https://discord.gg/jXMRp9hXSX) and set up a user feedback session to share your thoughts with us. +- If you are a developer, we are open to pull requests. Please first discuss your intentions via [GitHub Discussions](https://github.com/opsmill/infrahub/discussions) and send a pull request our way to fix it. + +Please see our [development docs](https://docs.infrahub.app/development/) for a guide to getting started developing for Infrahub. + +We maintain a [list of issues that are appropriate to newcomers](https://github.com/opsmill/infrahub/issues?q=is:open+is:issue+label:type/newcomers) to the Infrahub development community. This is a great place to get started! + +### How do I get help with Infrahub? + +If you need assistance with Infrahub, you can reach out to the community and the development team through the following channels: + +- Discord: Join the Infrahub [Discord](https://discord.gg/jXMRp9hXSX) server to ask questions, get support, and engage with other users. +- GitHub Issues: Submit issues or questions on the Infrahub GitHub repository (https://github.com/opsmill/infrahub/issues). + +### Will there be paid support or an Enterprise version of Infrahub? + +While Infrahub is currently an open-source project, the team is developing a plan for paid support and an enterprise version with additional features and services in the future. More information about these plans will be shared as the project progresses. + +### I have generated my configurations with Infrahub, how can I deploy them to my devices? + +Infrahub is designed to be the source of truth for your infrastructure data and configurations. It does not directly connect to or deploy configurations to your infrastructure devices. Instead, Infrahub integrates with tools like Nornir and Ansible, which can be used to deploy the generated configurations to your infrastructure. + +Please see the documentation on [integrations](../integrations) for more information. + +### Does Infrahub send telemetry? And how can I disable it? + +Infrahub collects anonymous usage metrics and sends them to OpsMill servers for analysis and improvement purposes. No personally identifiable information is collected. If you prefer to opt-out of telemetry collection, you can do so by setting the `INFRAHUB_TELEMETRY_OPTOUT` environment variable to `true`: + +```bash +export INFRAHUB_TELEMETRY_OPTOUT=true +``` + +### What telemetry does Infrahub send? + +The following information is included in telemetry: + +- Infrahub version +- Platform information +- Anonymous counters about the graph and the schema + +This information is used as aggregated analysis to better understand what and how to improve the project. All information collected are anonymous and the implementation is open source on Github. + +## About OpsMill + +### Who is behind this project? + +Infrahub is sponsored and developed by OpsMill, a startup focused on infrastructure management. The OpsMill team is distributed across Europe and the United States, with members who have extensive experience in managing infrastructure and building automation solutions. + +You can learn more about the OpsMill team and the company on our website: https://www.opsmill.com/about-us + +### Why is OpsMill’s mascot an Otter? + +Otters are really cool, and they are considered a keystone species, meaning they have a disproportionately large impact on their natural environment relative to their representation. + +Similarly, Infrahub aims to be a keystone platform for managing and automating infrastructure, providing a central and influential role in shaping and maintaining your infrastructure ecosystem. + +### What is the name of the otter? + + + +The OpsMill’s mascot is an otter named Otto. + +You can send fan mail to Otto at otto@opsmill.com! + +### Can Infrahub make me as cool as Tony Stark? + +Almost! You’ll definitely feel like a tech genius managing your infrastructure with Infrahub! + +### Made it this far? We'd love to hear from you + +If you've made it this far, please feel free to reach out on the [Discord](https://discord.gg/jXMRp9hXSX) server to share your thoughts or schedule a customer interview session. The Infrahub team is always eager to receive feedback and engage with the community. diff --git a/docs/docs/guides/artifact.mdx b/docs/docs/guides/artifact.mdx index cac01bf806..1e75825da5 100644 --- a/docs/docs/guides/artifact.mdx +++ b/docs/docs/guides/artifact.mdx @@ -129,7 +129,7 @@ git commit -m "add tags_config_file artifact definition" git push origin main ``` -The artifact definition will be created in the database, when the git agent(s) notice the change in the git repository. The `tags_config_file` should now be visible in the Artifact Definition view in the web interface. +The artifact definition will be created in the database, when the Git agent(s) notice the change in the Git repository. The `tags_config_file` should now be visible in the Artifact Definition view in the web interface.  ## Accessing the artifacts diff --git a/docs/docs/guides/check.mdx b/docs/docs/guides/check.mdx new file mode 100644 index 0000000000..142bfd5a8f --- /dev/null +++ b/docs/docs/guides/check.mdx @@ -0,0 +1,530 @@ +--- +title: Creating a Check +--- + +## Creating a Check + +Within Infrahub a [Check](/topics/check) is defined in an [external repository](/topics/repository). However, during development and troubleshooting it is easiest to start from your local computer and run the check using [infrahubctl check](/infrahubctl/infrahubctl-check). + +The goal of this guide is to develop a Check and add it to Infrahub, we will achieve this by following these steps. + +1. Identify the relevant data in the database that you want to use as input for the check using a [GraphQL query](/topics/graphql), that can take an input parameter to filter the data +2. Write a Python script that will process and validate the data using your custom business logic +3. Create an entry for the check within an .infrahub.yml file +4. Create a Git repository +5. Test the Check with the `infrahubctl` command +6. Add the repository to Infrahub as an external repository +7. Test the Check in a proposed change + +In this guide we are going to work with the builtin tag objects in Infrahub. The goal will be to use a check to validate the naming convention of an object using a Regex. Validating a string with a Regex is something we can do directly in the schema so this check won't be super helpful but the goal is instead to show how Checks work. Once you have mastered the basics you will be ready to go on to create more advanced Checks. + +### 1. Creating a query to collect the desired data + +As the first step we need to have some data in the database to actually query. + +Create three tags, called "color-red", "color-green", "blue", either using the frontend or by submitting three GraphQL mutations as per below (just swapping out the name of the color each time). +Note that the "blue" tag is following a different naming scheme compared to the other tags. This is on purpose and is needed for the rest of the guide. + +```GraphQL +mutation CreateTags { + BuiltinTagCreate( + data: {name: {value: "color-red"}, description: {value: "The red tag"}} + ) { + ok + object { + id + } + } +} +``` + +The next step is to create a query that returns the data we just created. The rest of this guide assumes that the following query will return a response similar to the response below the query. + +```GraphQL +query TagsQuery { + BuiltinTag { + edges { + node { + name { + value + } + description { + value + } + } + } + } +} +``` + +Response to the tags query: + +```json +{ + "data": { + "BuiltinTag": { + "edges": [ + { + "node": { + "name": { + "value": "blue" + }, + "description": { + "value": "The blue tag" + } + } + }, + { + "node": { + "name": { + "value": "color-green" + }, + "description": { + "value": "The green tag" + } + } + }, + { + "node": { + "name": { + "value": "color-red" + }, + "description": { + "value": "The red tag" + } + } + } + ] + } + } +} +``` + +Create a local directory on your computer. + +```bash +mkdir tags_check +``` + +Then save the `TagsQuery` as a text file named `tags_check.gql`. + +### 2. Create the Python check file + +The next step is to create the Check Python business logic. The check is a Python class that inherits from `InfrahubCheck` from the [Python SDK](/python-sdk). Create a file called `tags_check.py`: + +```python +import re + +from infrahub_sdk.checks import InfrahubCheck + + +RE_TAG = re.compile(r"^color-[a-z]+") + +class ColorTagsCheck(InfrahubCheck): + query = "tags_check" + + def validate(self, data): + for tag in data["BuiltinTag"]["edges"]: + if not RE_TAG.match(tag["node"]["name"]["value"]): + self.log_error( + message=f"Invalid tag name: {tag['node']['name']['value']}", + object_id=tag["node"]["name"]["value"], + object_type="BuiltinTag" + ) + +``` + +The example is a simple example of what a naming convention logic for a tag could look like. + +1. We import the `InfrahubCheck` class. + +```python +from infrahub_sdk.checks import InfrahubCheck +``` + +2. We create and compile a regular expression against which we will match the tag names + +```python +RE_TAG = re.compile(r"^color-[a-z]+") +``` + +3. We define our own class that inherits from `InfrahubCheck`. + +```python +class ColorTagsCheck(InfrahubCheck): +``` + +Here we need to take note of the name of the class as we will need it later, optionally we can just call it `Check` which is the default name. + +4. We define the query that will provide us the input data + +```python + query = "tags_check" +``` + +The query references to the file `tags_check.gql` that we created earlier. + +5. We define the validate method + +```python + def validate(self, data): + for tag in data["BuiltinTag"]["edges"]: + if not RE_TAG.match(tag["node"]["name"]["value"]): + self.log_error( + message=f"Invalid tag name: {tag['node']['name']['value']}", + object_id=tag["node"]["name"]["value"], + object_type="BuiltinTag" + ) +``` + +When running the check, the `data` argument will contain the response to the GraphQL query we created. We loop over every `BuiltinTag` node in `data` and validate that the name of the tag matches with the regular expression we created earlier. + +If the name does not match the regular expression, we log an error. A check will have failed if it has encountered errors during the execution. + +### 3. Create a .infrahub.yml file + +In the `.infrahub.yml` file you define what checks you have in your repository that you want to use in Infrahub. + +Create a `.infrahub.yml` file in the root of the directory. + +```yaml +--- +check_definitions: + - name: "check_color_tags_name" + class_name: "ColorTagsCheck" + file_path: "tags_check.py" +``` + +Two parts here are required, first the `name` of the check which should be unique across Infrahub and also the `file_path` that should point to the Python file within the repository. In this example we have also defined `class_name`, the reason for this is that we gave our class the name `ColorTagsCheck` instead of the default `Check`. + +### 4. Create a Git repository + +Within the `tags_check` folder you should now have 3 files: + +- `tags_check.gql`: Contains the GraphQL query +- `tags_check.py`: Contains the Python code with the business logic for the check +- `.infrahub.yml`: Contains the definition of the check + +Before we can test our transform we must add the files to a local Git repository. + +```bash +git init --initial-branch=main +git add . +git commit -m "First commit" +``` + +### 5. Test the check using infrahubctl + +Using infrahubctl you can first verify that the `.infrahub.yml` file is formatted correctly by listing available checks. + +```bash title="❯ infrahubctl check --list" +Python checks defined in repository: 1 +check_color_tags_name (tags_check.py::ColorTagsCheck) Target: -global- +``` + +Run the check by specifying the name of the check as an argument. + +```bash title="❯ infrahubctl check check_color_tags_name" +[09:23:25] INFO HTTP Request: POST http://localhost:8000/graphql "HTTP/1.1 200 OK" + ERROR tags_check::ColorTagsCheck: FAILED + ERROR Invalid tag name: blue +``` + +We have now successfully created a check. Most of the checks you will create would be more complex than this, however the main building blocks will always remain the same. + +### 6. Adding the repository to Infrahub + +In order to avoid having the same instructions over and over please refer to the guide [adding a repository to Infrahub](/guides/repository) in order to sync the repository you created and make it available within Infrahub. + +### 7. Using the check within Infrahub + +Once the repository is synced to Infrahub, the check will be run as part of a proposed change. + +1. Open a branch named `test` +2. Create a new `BuiltinTag` object named `orange` in the `test` branch +3. Open a proposed change +4. Navigate to the Checks tab +5. The User Checks should have a red color, indicating a Check has failed +6. Expanding the Check `check_color_tags_name` should show us that the check failed because the `BuiltinTag` objects `blue` and `orange` do not match with our naming scheme + + + +## Creating a targeted check + +Let's extend our example. We want to introduce a second set of tags. The naming scheme for these tags is different so we would need to introduce a second check. + +Therefor we will redefine our `check_color_tags_name` check as a targeted check, and define a new targeted check for the tags with a different naming scheme. + +We will be performing the following steps: + +1. Define targets for the `check_color_tags_name` check in the repository configuration file +2. Create a new group `ColorTags` +3. Add the existing tags to a group named `ColorTags` +4. Modify the `tags_check` GraphQL query +5. Test the `check_color_tags_name` check +6. Add new `BuiltinTags` using the other naming schema +7. Create a new group `NumberTags` +8. Add the tags with the number naming scheme to the group +9. Add a new check to the Python `tags_checkk.py` script for the number naming scheme +10. Define a new targeted check in the repository configuration file +11. Test the new check + +Before we start, make sure that you switch back to the `main` branch in Infrahub. + +### 1. Define the targets for the `check_color_tags_name` check in the repository configuration file + +Replace the contents of the `.infrahub.yml` file with this content. + +```yaml +--- +check_definitions: + - name: "check_color_tags_name" + class_name: "ColorTagsCheck" + file_path: "tags_check.py" + targets: "ColorTags" + parameters: + name: "name__value" +``` + +We added 2 definitions to the `check_color_tags_name`: + +- `targets` the name of the group with the nodes that we want to target `ColorTags` +- `parameters` we define a `name` parameter that will be passed to the check's GraphQL query, in this case we will pass the value of the name attribute of each tag in the group + +### 2. Creating a `ColorTags` group + +Targeted checks use nodes in a group a their targets. Create the `ColorTags` group with this GraphQL query. Take node of the id of the group, we will need it in the next steps. + +```graphql +mutation { + CoreStandardGroupCreate(data: {name: {value: "ColorTags"}}) { + ok + object { + id + } + } +} +``` + +### 3. Add the existing tags to a the `ColorTags` group + +First we need to get the id of the existing tags. + +```graphql +query { + BuiltinTag { + edges { + node { + id + } + } + } +} +``` + +We can then use the id's of the tags to add them to the `ColorTags` group. + +- replace the first id with the id of the group +- replace the second id with the id of the first tag returned by the previous query +- replace the third id with the id of the second tag returned by the previous query +- replace the fourth id with the id of the third tag returned by the previous query + +```graphql +mutation { + CoreStandardGroupUpdate( + data: { + id: "
Generate a GitHub fine-grained personal access token
@@ -156,7 +156,9 @@ Read-only repositories and CoreRepositories work in different ways when it comes The [Infrahub Git agent](/reference/git-agent) checks for changes in external repositories several times per minute. If there are no conflicts between the remote and the Infrahub branches, the Git agent will automatically pull any new changes into the appropriate Infrahub branch. -### Read-only repository + +### Read-only Repository + Infrahub does not automatically update Read-only Repositories with changes on the external repository. To pull in changes from the external repository you must either set the `ref` **and/or** `commit` of the Read-only Repository to the desired value. You can perform this update either through the user interface or via an update mutation through the GraphQL API. Either way, the Infrahub web server will use the Git agent to retrieve the appropriate changes in a background task. @@ -188,6 +190,8 @@ Infrahub does not automatically update Read-only Repositories with changes on th When a [Proposed Change](/topics/proposed-change) is merged, if the source and destination Infrahub branches are both linked to branches on the same external Git repository, then Infrahub will handle merging the branches on the external Git repository. This is the only time that Infrahub will push changes to the external repository. Other changes made within Infrahub will not be pushed to an external repository and **could potentially be overwritten** when Infrahub pulls new commits from the external repository. + ### Read-only Repository + No changes to objects owned by a Read-only Repository are ever pushed to the external Git repository. diff --git a/docs/docs/guides/schema.mdx b/docs/docs/guides/schema.mdx index 99c574d91a..e79b859089 100644 --- a/docs/docs/guides/schema.mdx +++ b/docs/docs/guides/schema.mdx @@ -29,6 +29,12 @@ extensions:**Type**: `string`
**Default value**: http://localhost:8000
-**Environment variable**: `INFRAHUB_SDK_ADDRESS`
+**Environment variable**: `INFRAHUB_ADDRESS`
## api_token **Property**: api_token
**Description**: API token for authentication against Infrahub.
**Type**: `string`
-**Environment variable**: `INFRAHUB_SDK_API_TOKEN`
+**Environment variable**: `INFRAHUB_API_TOKEN`
## echo_graphql_queries @@ -46,21 +46,21 @@ The following settings can be defined in the Config class **Description**: If set the GraphQL query and variables will be echoed to the screen
**Type**: `boolean`
**Default value**: False
-**Environment variable**: `INFRAHUB_SDK_ECHO_GRAPHQL_QUERIES`
+**Environment variable**: `INFRAHUB_ECHO_GRAPHQL_QUERIES`
## username **Property**: username
**Description**: Username for accessing Infrahub
**Type**: `string`
-**Environment variable**: `INFRAHUB_SDK_USERNAME`
+**Environment variable**: `INFRAHUB_USERNAME`
## password **Property**: password
**Description**: Password for accessing Infrahub
**Type**: `string`
-**Environment variable**: `INFRAHUB_SDK_PASSWORD`
+**Environment variable**: `INFRAHUB_PASSWORD`
## default_branch @@ -68,7 +68,7 @@ The following settings can be defined in the Config class **Description**: Default branch to target if not specified for each request.
**Type**: `string`
**Default value**: main
-**Environment variable**: `INFRAHUB_SDK_DEFAULT_BRANCH`
+**Environment variable**: `INFRAHUB_DEFAULT_BRANCH`
## default_branch_from_git @@ -76,14 +76,14 @@ The following settings can be defined in the Config class **Description**: Indicates if the default Infrahub branch to target should come from the active branch in the local Git repository.
**Type**: `boolean`
**Default value**: False
-**Environment variable**: `INFRAHUB_SDK_DEFAULT_BRANCH_FROM_GIT`
+**Environment variable**: `INFRAHUB_DEFAULT_BRANCH_FROM_GIT`
## identifier **Property**: identifier
**Description**: Tracker identifier
**Type**: `string`
-**Environment variable**: `INFRAHUB_SDK_IDENTIFIER`
+**Environment variable**: `INFRAHUB_IDENTIFIER`
## insert_tracker @@ -91,7 +91,7 @@ The following settings can be defined in the Config class **Description**: Insert a tracker on queries to the server
**Type**: `boolean`
**Default value**: False
-**Environment variable**: `INFRAHUB_SDK_INSERT_TRACKER`
+**Environment variable**: `INFRAHUB_INSERT_TRACKER`
## max_concurrent_execution @@ -99,7 +99,7 @@ The following settings can be defined in the Config class **Description**: Max concurrent execution in batch mode
**Type**: `integer`
**Default value**: 5
-**Environment variable**: `INFRAHUB_SDK_MAX_CONCURRENT_EXECUTION`
+**Environment variable**: `INFRAHUB_MAX_CONCURRENT_EXECUTION`
## mode @@ -108,7 +108,7 @@ The following settings can be defined in the Config class **Type**: `string`
**Default value**: default
**Choices**: default, tracking
-**Environment variable**: `INFRAHUB_SDK_MODE`
+**Environment variable**: `INFRAHUB_MODE`
## pagination_size @@ -116,7 +116,7 @@ The following settings can be defined in the Config class **Description**: Page size for queries to the server
**Type**: `integer`
**Default value**: 50
-**Environment variable**: `INFRAHUB_SDK_PAGINATION_SIZE`
+**Environment variable**: `INFRAHUB_PAGINATION_SIZE`
## retry_delay @@ -124,7 +124,7 @@ The following settings can be defined in the Config class **Description**: Number of seconds to wait until attempting a retry.
**Type**: `integer`
**Default value**: 5
-**Environment variable**: `INFRAHUB_SDK_RETRY_DELAY`
+**Environment variable**: `INFRAHUB_RETRY_DELAY`
## retry_on_failure @@ -132,7 +132,7 @@ The following settings can be defined in the Config class **Description**: Retry operation in case of failure
**Type**: `boolean`
**Default value**: False
-**Environment variable**: `INFRAHUB_SDK_RETRY_ON_FAILURE`
+**Environment variable**: `INFRAHUB_RETRY_ON_FAILURE`
## timeout @@ -140,7 +140,7 @@ The following settings can be defined in the Config class **Description**: Default connection timeout in seconds
**Type**: `integer`
**Default value**: 10
-**Environment variable**: `INFRAHUB_SDK_TIMEOUT`
+**Environment variable**: `INFRAHUB_TIMEOUT`
## transport @@ -149,21 +149,21 @@ The following settings can be defined in the Config class **Type**: `string`
**Default value**: httpx
**Choices**: httpx, json
-**Environment variable**: `INFRAHUB_SDK_TRANSPORT`
+**Environment variable**: `INFRAHUB_TRANSPORT`
## proxy **Property**: proxy
**Description**: Proxy address
**Type**: `string`
-**Environment variable**: `INFRAHUB_SDK_PROXY`
+**Environment variable**: `INFRAHUB_PROXY`
## proxy_mounts **Property**: proxy_mounts
**Description**: Proxy mounts configuration
**Type**: `object`
-**Environment variable**: `INFRAHUB_SDK_PROXY_MOUNTS`
+**Environment variable**: `INFRAHUB_PROXY_MOUNTS`
## update_group_context @@ -171,7 +171,25 @@ The following settings can be defined in the Config class **Description**: Update GraphQL query groups
**Type**: `boolean`
**Default value**: False
-**Environment variable**: `INFRAHUB_SDK_UPDATE_GROUP_CONTEXT`
+**Environment variable**: `INFRAHUB_UPDATE_GROUP_CONTEXT`
+ +## tls_insecure + +**Property**: tls_insecure
+**Description**: + Indicates if TLS certificates are verified. + Enabling this option will disable: CA verification, expiry date verification, hostname verification). + Can be useful to test with self-signed certificates.
+**Type**: `boolean`
+**Default value**: False
+**Environment variable**: `INFRAHUB_TLS_INSECURE`
+ +## tls_ca_file + +**Property**: tls_ca_file
+**Description**: File path to CA cert or bundle in PEM format
+**Type**: `string`
+**Environment variable**: `INFRAHUB_TLS_CA_FILE`
## recorder diff --git a/docs/docs/readme.mdx b/docs/docs/readme.mdx index d303ad29ec..31c89b2b46 100644 --- a/docs/docs/readme.mdx +++ b/docs/docs/readme.mdx @@ -4,41 +4,19 @@ title: Introduction # Welcome to Infrahub -Infrahub is taking a new approach to Infrastructure Management by providing a new generation of datastore to organize and control all the data that defines how an infrastructure should run. +Infrahub from [OpsMill](https://opsmill.com) is taking a new approach to Infrastructure Management by providing a new generation of datastore to organize and control all the data that defines how an infrastructure should run. Infrahub offers a central hub to manage the data, templates and playbooks that power your infrastructure by combining the version control and branch management capabilities of Git with the flexible data model and UI of a graph database. -At its heart, Infrahub is built on 3 fundamental pillars: +## Learn about Infrahub -- **Powerful Schema**: that's easily extensible -- **Unified Version Control**: for data and files -- **Data Synchronization**: with traceability and ownership +- **[Overview](./overview/)** explains Infrahub's architecture and concepts. +- **[Tutorials](./tutorials/getting-started/)** walk you through learning Infrahub's basic features. +- **[Guides](./guides/)** comprise a comprehensive set of "how-to" topics, covering the key features of Infrahub. +- **[Topics](./topics/)** provide a more in-depth technical explanation of various features, implementation, and deployment details. +- **[Reference](./reference/)** documents technical implementation details such as available options for features and commands. +- **[FAQ](./faq)** covers project status and how to get involved. -## Getting started +## Deploy Infrahub - Choose your Infrahub deployment method: - [Deploy an instance of Infrahub in the Cloud via GitHub Codespaces](https://github.com/opsmill/infrahub?tab=readme-ov-file#quick-start) - - [Deploy the demo environment on your laptop](/tutorials/getting-started/#prepare-the-demo-environment) -- Explore the Python SDK to easily interact with Infrahub -- Explore the capabilities of the schema -- Check the architecture document to understand how the application is built - -## Project status - -The project is currently in a Tech Preview phase, which means that not all features we are targeting for the first major release have been implemented yet and the project is still evolving at a very rapid pace with the (un)stability that you would expect in an early project. - -Having said that there are several features already available and you should be able already to: - -- Manage branches and query any branches -- Integrate a Git repository within Infrahub -- Integrate and render Jinja2 templates -- Expose new data Transformation endpoints -- Validate data within the CI/CD pipeline -- Extend the current schema -- Query and modify data via the GraphQL interface -- Access the previous state of the data and the extensions -- Branch diff - -Missing features we are actively working on. - -- Object Profile and Inheritance -- Pull requests -- Branches support for the schema and schema migration + - [Deploy the demo environment on your infrastructure](./guides/installation) diff --git a/docs/docs/reference/configuration.mdx b/docs/docs/reference/configuration.mdx index 5da2c79689..32d0ceff64 100644 --- a/docs/docs/reference/configuration.mdx +++ b/docs/docs/reference/configuration.mdx @@ -3,21 +3,112 @@ title: Configuration file --- import CodeBlock from "@theme/CodeBlock"; -import infrahubConfigPy from '!!raw-loader!../../../backend/infrahub/config.py'; # Configuration file -:::warning Under Construction +The Infrahub containers have a number of environmental variables available at runtime to affect their behavior. -This page is still under construction and is not available yet.
-Please reach out in Slack if you have some questions about the **Configuration file** +## Usage + +Here are a few common methods of setting environmental variables: + +- Exporting in a shell, e.g.: `export INFRAHUB_ADDRESS="http://localhost:8000"` +- Using a [`.env` file](https://docs.docker.com/compose/environment-variables/set-environment-variables/#substitute-with-an-env-file) +- Using [direnv](https://direnv.net/) + +:::note + +`infrahubctl` has it's own environmental variables. See the [infrahubctl documentation](../infrahubctl#environment-variables) for more information. ::: -Until a better documentation is available, the best reference to understand what options are available in the configuration file is the code itself. -The configuration file format is defined in Pydantic models in `infrahub/config.py` +## Infrahub environmental variables + -
- {infrahubConfigPy}
-
+| Name | Description | Example | Alias | |
+|---|---|---|---|---|
+| AWS_ACCESS_KEY_ID | | | | |
+| AWS_SECRET_ACCESS_KEY | | | | |
+| DB_TYPE | | | | |
+| INFRAHUB_ADDRESS | "HTTP endpoint of the API Server, used by the git agent for internal communication" | http://infrahub-server:8000 | | |
+| INFRAHUB_ALLOW_ANONYMOUS_ACCESS | Indicates if the system allows anonymous read access | TRUE | | |
+| INFRAHUB_ANALYTICS_ADDRESS | | | | |
+| INFRAHUB_ANALYTICS_API_KEY | | | | |
+| INFRAHUB_ANALYTICS_ENABLE | | | | |
+| INFRAHUB_API_CORS_ALLOW_CREDENTIALS | "If True, cookies will be allowed to be included in cross-site HTTP requests" | | | |
+| INFRAHUB_API_CORS_ALLOW_HEADERS | The list of non-standard HTTP headers allowed in requests from the browser | | | |
+| INFRAHUB_API_CORS_ALLOW_METHODS | A list of HTTP verbs that are allowed for the actual request | | | |
+| INFRAHUB_API_CORS_ALLOW_ORIGINS | A list of origins that are authorized to make cross-site HTTP requests | | | |
+| INFRAHUB_BROKER_ADDRESS | | message-queue | | |
+| INFRAHUB_BROKER_DRIVER | | | | |
+| INFRAHUB_BROKER_ENABLE | | | | |
+| INFRAHUB_BROKER_MAXIMUM_CONCURRENT_MESSAGES | The maximum number of concurrent messages fetched by each worker | | | |
+| INFRAHUB_BROKER_MAXIMUM_MESSAGE_RETRIES | The maximum number of retries that are attempted for failed messages | | | |
+| INFRAHUB_BROKER_NAMESPACE | | | | |
+| INFRAHUB_BROKER_PASSWORD | | infrahub | | |
+| INFRAHUB_BROKER_PORT | Specified if running on a non default port. | | | |
+| INFRAHUB_BROKER_TLS_CA_FILE | File path to CA cert or bundle in PEM format | | | |
+| INFRAHUB_BROKER_TLS_ENABLED | Indicates if TLS is enabled for the connection | | | |
+| INFRAHUB_BROKER_TLS_INSECURE | Indicates if TLS certificates are verified | | | |
+| INFRAHUB_BROKER_USERNAME | | | | |
+| INFRAHUB_BROKER_VIRTUALHOST | The virtual host to connect to | | | |
+| INFRAHUB_CACHE_ADDRESS | | cache | | |
+| INFRAHUB_CACHE_DATABASE | Id of the database to use | | | |
+| INFRAHUB_CACHE_DRIVER | | | | |
+| INFRAHUB_CACHE_ENABLE | | | | |
+| INFRAHUB_CACHE_PASSWORD | | | | |
+| INFRAHUB_CACHE_PORT | Specified if running on a non default port (6379) | 6379 | | |
+| INFRAHUB_CACHE_TLS_CA_FILE | File path to CA cert or bundle in PEM format | | | |
+| INFRAHUB_CACHE_TLS_ENABLED | Indicates if TLS is enabled for the connection | | | |
+| INFRAHUB_CACHE_TLS_INSECURE | Indicates if TLS certificates are verified | | | |
+| INFRAHUB_CACHE_USERNAME | | | | |
+| INFRAHUB_CONFIG | Location of the configuration file for Infrahub | infrahub.toml | | |
+| INFRAHUB_DB_ADDRESS | | database | | |
+| INFRAHUB_DB_DATABASE | Name of the database | | | |
+| INFRAHUB_DB_MAX_DEPTH_SEARCH_HIERARCHY | Maximum number of level to search in a hierarchy. | | | |
+| INFRAHUB_DB_PASSWORD | | | | |
+| INFRAHUB_DB_PORT | | | | |
+| INFRAHUB_DB_PROTOCOL | | | | |
+| INFRAHUB_DB_QUERY_SIZE_LIMIT | The max number of records to fetch in a single query before performing internal pagination. | | | |
+| INFRAHUB_DB_RETRY_LIMIT | Maximum number of times a transient issue in a transaction should be retried. | | | |
+| INFRAHUB_DB_TLS_CA_FILE | File path to CA cert or bundle in PEM format | | | |
+| INFRAHUB_DB_TLS_ENABLED | Indicates if TLS is enabled for the connection | | | |
+| INFRAHUB_DB_TLS_INSECURE | Indicates if TLS certificates are verified | | | |
+| INFRAHUB_DB_TYPE | | neo4j | | |
+| INFRAHUB_DB_USERNAME | | | | |
+| INFRAHUB_DOCS_INDEX_PATH | Full path of saved json containing pre-indexed documentation | | | |
+| INFRAHUB_EXPERIMENTAL_GRAPHQL_ENUMS | | | | |
+| INFRAHUB_EXPERIMENTAL_PULL_REQUEST | | | | |
+| INFRAHUB_INITIAL_ADMIN_PASSWORD | The initial password for the admin user | | | |
+| INFRAHUB_INITIAL_ADMIN_TOKEN | The initial password for the admin user | | | |
+| INFRAHUB_INITIAL_AGENT_PASSWORD | The initial password for the agent user | | | |
+| INFRAHUB_INITIAL_AGENT_TOKEN | The initial password for the agent user | | | |
+| INFRAHUB_INITIAL_DEFAULT_BRANCH | "Defines the name of the default branch within Infrahub, can only be set once during initialization of the system." | | | |
+| INFRAHUB_INTERNAL_ADDRESS | | http://infrahub-server:8000 | | |
+| INFRAHUB_LOG_LEVEL | "Set the level of the log to print in the console: info, debug, warning" | INFO | | |
+| INFRAHUB_LOGGING_REMOTE_API_SERVER_DSN | | | | |
+| INFRAHUB_LOGGING_REMOTE_ENABLE | | | | |
+| INFRAHUB_LOGGING_REMOTE_FRONTEND_DSN | | | | |
+| INFRAHUB_LOGGING_REMOTE_GIT_AGENT_DSN | | | | |
+| INFRAHUB_MISC_MAXIMUM_VALIDATOR_EXECUTION_TIME | The maximum allowed time (in seconds) for a validator to run. | | | |
+| INFRAHUB_MISC_PRINT_QUERY_DETAILS | | | | |
+| INFRAHUB_MISC_START_BACKGROUND_RUNNER | | | | |
+| INFRAHUB_PRODUCTION | "Enable or disable the production mode, in production mode the logs are generated in JSON format" | FALSE | | |
+| INFRAHUB_SECURITY_ACCESS_TOKEN_LIFETIME | Lifetime of access token in seconds | | | |
+| INFRAHUB_SECURITY_REFRESH_TOKEN_LIFETIME | Lifetime of refresh token in seconds | | | |
+| INFRAHUB_STORAGE_BUCKET_NAME | | infrahub-data | AWS_S3_BUCKET_NAME | |
+| INFRAHUB_STORAGE_CUSTOM_DOMAIN | | | AWS_S3_CUSTOM_DOMAIN | |
+| INFRAHUB_STORAGE_DEFAULT_ACL | | | AWS_DEFAULT_ACL | |
+| INFRAHUB_STORAGE_ENDPOINT_URL | | | AWS_S3_ENDPOINT_URL | |
+| INFRAHUB_STORAGE_LOCAL_PATH | | /opt/infrahub/storage | | |
+| INFRAHUB_STORAGE_QUERYTSTRING_AUTH | | | AWS_QUERYSTRING_AUTH | |
+| INFRAHUB_STORAGE_USE_SSL | | | AWS_S3_USE_SSL | |
+| INFRAHUB_STORAGE_DRIVER | | local | | |
+| INFRAHUB_TRACE_ENABLE | | FALSE | | |
+| INFRAHUB_TRACE_EXPORTER_ENDPOINT | OTLP endpoint for exporting traces | | | |
+| INFRAHUB_TRACE_EXPORTER_PROTOCOL | Protocol to be used for exporting traces | | | |
+| INFRAHUB_TRACE_EXPORTER_TYPE | Type of exporter to be used for tracing | | | |
+| INFRAHUB_TRACE_INSECURE | "Use insecure connection (HTTP) if True, otherwise use secure connection (HTTPS)" | | | |
+| REPOSITORIES_DIRECTORY | | | | |
+| SYNC_INTERVAL | Time (in seconds) between git repositories synchronizations | | | |
+
diff --git a/docs/docs/reference/dotinfrahub.mdx b/docs/docs/reference/dotinfrahub.mdx
index 4e03ae3622..c3fe763276 100644
--- a/docs/docs/reference/dotinfrahub.mdx
+++ b/docs/docs/reference/dotinfrahub.mdx
@@ -14,6 +14,12 @@ See [this topic](/topics/infrahub-yml) for more details on the available reposit
:::
+:::note
+
+To help with the development process of a repository configuration file, you can leverage the schemas we publish for validation within your [editor](/development/editor)
+
+:::
+
## Check Definitions
diff --git a/docs/docs/reference/message-bus-events.mdx b/docs/docs/reference/message-bus-events.mdx
index 0f01aadc39..242273e4ff 100644
--- a/docs/docs/reference/message-bus-events.mdx
+++ b/docs/docs/reference/message-bus-events.mdx
@@ -974,6 +974,24 @@ For more detailed explanations on how to use these events within Infrahub, see t
| **event_data** | The data tied to the event | object | None |
+
+### Send Telemetry
+
+
+
+#### Event send.telemetry.push
+
+
+**Description**: Push usage telemetry.
+
+**Priority**: 3
+
+
+| Key | Description | Type | Default Value |
+|-----|-------------|------|---------------|
+| **meta** | Meta properties for the message | N/A | None |
+
+
### Transform Jinja
@@ -2134,6 +2152,25 @@ For more detailed explanations on how to use these events within Infrahub, see t
| **event_data** | The data tied to the event | object | None |
+
+### Send Telemetry
+
+
+
+#### Event send.telemetry.push
+
+
+**Description**: Push usage telemetry.
+
+**Priority**: 3
+
+
+
+| Key | Description | Type | Default Value |
+|-----|-------------|------|---------------|
+| **meta** | Meta properties for the message | N/A | None |
+
+
### Transform Jinja
diff --git a/docs/docs/reference/schema-validation.mdx b/docs/docs/reference/schema-validation.mdx
new file mode 100644
index 0000000000..5d76198acb
--- /dev/null
+++ b/docs/docs/reference/schema-validation.mdx
@@ -0,0 +1,65 @@
+---
+title: Schema validation
+---
+
+Infrahub requires the user to define multiple YAML files. One or more files defining the [schema in Infrahub](/topics/schema) and the [external repository configuration file](/topics/repository).
+
+To help with the process of creating and maintaining these files, we publish JSON schemas that allow you to validate the schema of these files.
+
+## Language server
+
+To be able to validate a YAML against a schema, you need to install a language server. Which language server you can use is specific to your environment and the editor that you use. For Visual Studio Code we recommend that you install the
+[Red Hat YAML Language server](https://marketplace.visualstudio.com/items?itemName=redhat.vscode-yaml).
+
+A language server is a software that helps an editor provide advanced language specific features like: code completion, refactoring, navigation, syntax highlighting, schema validation etc.
+
+## Schema validation for Infrahub schema files
+
+The schema for Infrahub schema files is published at https://schema.infrahub.app/infrahub/schema/latest.json
+
+To use this schema for validation, you have to add a modeline near the top, or the bottom of the schema file.
+
+A modeline is a file specific configuration parameter that configures the editor with a specific behavior. In our case it configures the editor's language server to use the schema at the URL for schema validation.
+
+This modeline can be used for Infrahub schema files.
+
+```yaml
+# yaml-language-server: $schema=https://schema.infrahub.app/infrahub/schema/latest.json
+```
+
+An example in an Infrahub schema file.
+
+```yaml
+# yaml-language-server: $schema=https://schema.infrahub.app/infrahub/schema/latest.json
+nodes:
+ - name: Test
+ namespace: Infra
+```
+
+## Schema validation for Infrahub external repository configuration files
+
+The schema for an Infrahub external repository configuration file is published at https://schema.infrahub.app/python-sdk/repository-config/latest.json
+
+To use this schema for validation, you have to add a modeline near the top, or the bottom of the repository configuration file.
+
+A modeline is a file specific configuration parameter that configures the editor with a specific behavior. In our case it configures the editor's language server to use the schema at the URL for schema validation.
+
+This modeline can be used for an Infrahub external repository configuration file.
+
+```yaml
+# yaml-language-server: $schema=https://schema.infrahub.app/python-sdk/repository-config/latest.json
+```
+
+An example in an Infrahub schema file.
+
+```yaml
+# yaml-language-server: $schema=https://schema.infrahub.app/python-sdk/repository-config/latest.json
+schemas:
+ - ./schemas/locations.yml
+```
+
+:::note
+
+The schema of the Infrahub external repository configuration file has been published on [JSON Schema store](https://www.schemastore.org/json/). It allows an editor, like Visual Studio Code to download the correct schema validation file. Visual Studio Code will automatically validate a file named `.infrahub.y(a)ml` with this schema, if the Red Hat YAML Language server is installed.
+
+:::
diff --git a/docs/docs/reference/schema/generic.mdx b/docs/docs/reference/schema/generic.mdx
index 44a36940b4..0cb38dbc0c 100644
--- a/docs/docs/reference/schema/generic.mdx
+++ b/docs/docs/reference/schema/generic.mdx
@@ -15,11 +15,12 @@ Below is the list of all available options to define a Generic in the schema
| Name | Type | Description | Mandatory |
| ---- | ---- | ---- | --------- |
| [**branch**](#branch) | Attribute | Type of branch support for the model. | False |
-| [**default_filter**](#default_filter) | Attribute | Default filter used to search for a node in addition to its ID. | False |
+| [**default_filter**](#default_filter) | Attribute | Default filter used to search for a node in addition to its ID. (deprecated: please use human_friendly_id instead) | False |
| [**description**](#description) | Attribute | Short description of the model, will be visible in the frontend. | False |
| [**display_labels**](#display_labels) | Attribute | List of attributes to use to generate the display label | False |
| [**documentation**](#documentation) | Attribute | Link to a documentation associated with this object, can be internal or external. | False |
| [**hierarchical**](#hierarchical) | Attribute | Defines if the Generic support the hierarchical mode. | False |
+| [**human_friendly_id**](#human_friendly_id) | Attribute | Human friendly and unique identifier for the object. | False |
| [**icon**](#icon) | Attribute | Defines the icon to use in the menu. Must be a valid value from the MDI library https://icon-sets.iconify.design/mdi/ | False |
| [**include_in_menu**](#include_in_menu) | Attribute | Defines if objects of this kind should be included in the menu. | False |
| [**label**](#label) | Attribute | Human friendly representation of the name/kind | False |
@@ -53,7 +54,7 @@ Below is the list of all available options to define a Generic in the schema
| ---- | --------------- |
| **Name** | default_filter |
| **Kind** | `Text` |
-| **Description** | Default filter used to search for a node in addition to its ID. |
+| **Description** | Default filter used to search for a node in addition to its ID. (deprecated: please use human_friendly_id instead) |
| **Optional** | True |
| **Default Value** | |
| **Constraints** | Regex: `^[a-z0-9\_]+$` |
@@ -102,6 +103,17 @@ Below is the list of all available options to define a Generic in the schema
| **Default Value** | False |
| **Constraints** | |
+### human_friendly_id
+
+| Key | Value |
+| ---- | --------------- |
+| **Name** | human_friendly_id |
+| **Kind** | `List` |
+| **Description** | Human friendly and unique identifier for the object. |
+| **Optional** | True |
+| **Default Value** | |
+| **Constraints** | |
+
### icon
| Key | Value |
diff --git a/docs/docs/reference/schema/node.mdx b/docs/docs/reference/schema/node.mdx
index 619234e2c3..d8b566a249 100644
--- a/docs/docs/reference/schema/node.mdx
+++ b/docs/docs/reference/schema/node.mdx
@@ -16,11 +16,12 @@ Below is the list of all available options to define a Node in the schema
| ---- | ---- | ----------- | --------- |
| [**branch**](#branch) | Attribute | Type of branch support for the model. | False |
| [**children**](#children) | Attribute | Expected Kind for the children nodes in a Hierarchy, default to the main generic defined if not defined. | False |
-| [**default_filter**](#default_filter) | Attribute | Default filter used to search for a node in addition to its ID. | False |
+| [**default_filter**](#default_filter) | Attribute | Default filter used to search for a node in addition to its ID. (deprecated: please use human_friendly_id instead) | False |
| [**description**](#description) | Attribute | Short description of the model, will be visible in the frontend. | False |
| [**display_labels**](#display_labels) | Attribute | List of attributes to use to generate the display label | False |
| [**documentation**](#documentation) | Attribute | Link to a documentation associated with this object, can be internal or external. | False |
| [**hierarchy**](#hierarchy) | Attribute | Internal value to track the name of the Hierarchy, must match the name of a Generic supporting hierarchical mode | False |
+| [**human_friendly_id**](#human_friendly_id) | Attribute | Human friendly and unique identifier for the object. | False |
| [**icon**](#icon) | Attribute | Defines the icon to use in the menu. Must be a valid value from the MDI library https://icon-sets.iconify.design/mdi/ | False |
| [**include_in_menu**](#include_in_menu) | Attribute | Defines if objects of this kind should be included in the menu. | False |
| [**inherit_from**](#inherit_from) | Attribute | List of Generic Kind that this node is inheriting from | False |
@@ -66,7 +67,7 @@ Below is the list of all available options to define a Node in the schema
| ---- | --------------- |
| **Name** | default_filter |
| **Kind** | `Text` |
-| **Description** | Default filter used to search for a node in addition to its ID. |
+| **Description** | Default filter used to search for a node in addition to its ID. (deprecated: please use human_friendly_id instead) |
| **Optional** | True |
| **Default Value** | |
| **Constraints** | Regex: `^[a-z0-9\_]+$` |
@@ -115,6 +116,17 @@ Below is the list of all available options to define a Node in the schema
| **Default Value** | |
| **Constraints** | |
+### human_friendly_id
+
+| Key | Value |
+| ---- | --------------- |
+| **Name** | human_friendly_id |
+| **Kind** | `List` |
+| **Description** | Human friendly and unique identifier for the object. |
+| **Optional** | True |
+| **Default Value** | |
+| **Constraints** | |
+
### icon
| Key | Value |
diff --git a/docs/docs/reference/schema/validator-migration.mdx b/docs/docs/reference/schema/validator-migration.mdx
index 592b191b55..7c40ce4f41 100644
--- a/docs/docs/reference/schema/validator-migration.mdx
+++ b/docs/docs/reference/schema/validator-migration.mdx
@@ -32,6 +32,7 @@ In this context, an element represent either a Node, a Generic, an Attribute or
| **label** | allowed |
| **branch** | not_supported |
| **default_filter** | allowed |
+| **human_friendly_id** | allowed |
| **display_labels** | allowed |
| **include_in_menu** | allowed |
| **menu_placement** | allowed |
@@ -100,6 +101,7 @@ In this context, an element represent either a Node, a Generic, an Attribute or
| **label** | allowed |
| **branch** | not_supported |
| **default_filter** | allowed |
+| **human_friendly_id** | allowed |
| **display_labels** | allowed |
| **include_in_menu** | allowed |
| **menu_placement** | allowed |
diff --git a/docs/docs/release-notes/release-0_10.mdx b/docs/docs/release-notes/release-0_10.mdx
index c5ef640e9d..f334b6aa49 100644
--- a/docs/docs/release-notes/release-0_10.mdx
+++ b/docs/docs/release-notes/release-0_10.mdx
@@ -10,7 +10,7 @@ title: Release 0.10
Explore the Source Code for the configuration File
-| Release Number | +0.14.0 | +
|---|---|
| Release Date | +May 27, 2024 | +
| Release Codename | +Beta #3 | +
| Tag | +[infrahub-v0.14.0](https://github.com/opsmill/infrahub/releases/tag/infrahub-v0.14.0) | +
Please reach out in Slack if you have some questions about the **Bus events** -::: \ No newline at end of file +::: + +## Architecture + +Infrahub requires the following features from the message bus: + +1. Retry messages with a delay +2. Broadcast messages to multiple consumers +3. Asynchronous RPC +4. Set priorities to messages + +Depending on the message bus system, we implement them using the following: + +### RabbitMQ + +1. We create a `delayed` exchange and multiple queues per TTL variation. When there is an error on message processing, the worker will publish the failed message in the delayed exchange with the delay TTL set. + Note: for non-acked (NAK, expired, dropped, or lost) messages, we make use of a dead-letter exchange (DLX). + Note bis: events and callback messages do not require acknowledgment. +2. We create one `events` queue per worker binding on the required broadcast messages using their routing keys. +3. Requests are sent to the exchange and processed by an unique queue where each worker consume messages. + We also create one `callback` queue per worker and use the `reply-to` header to send reply messages to this queue. +4. Priorities are handled using the `priority` field of message properties. + +### NATS JetStream + +1. We NAK the message with a delay. +2. We create an `events` stream with retention policy set to `INTEREST` and create an ephemeral consumer for each worker. +3. Requests are sent to the `rpcs` stream with retention policy set to `WORK_QUEUE` and create a consumer group on which each worker will subscribe. + We also create one `callback` stream per worker and publish to this stream for the replies. +4. **We do not handle priorities.** diff --git a/docs/docs/topics/generator.mdx b/docs/docs/topics/generator.mdx index 73f6768b31..2463df17a6 100644 --- a/docs/docs/topics/generator.mdx +++ b/docs/docs/topics/generator.mdx @@ -28,4 +28,8 @@ The targets point to a group that will consist of objects that are impacted by t The [GraphQL query](graphql) defines the data that will be collected when running the generator. Any object identified in this step is added as a member to a GraphQL query group. The membership in these groups are then used to determine which generators need to be executed as part of a proposed change during the pipeline run. -The Generator itself is a Python class that is based on the `InfrahubGenerator` class from the SDK. Just like [transforms](transformation) and [checks](check), the Generators are user defined. \ No newline at end of file +The Generator itself is a Python class that is based on the `InfrahubGenerator` class from the SDK. Just like [transforms](transformation) and [checks](check), the Generators are user defined. + +## Known limitations + +- [3289](https://github.com/opsmill/infrahub/issues/3289) deleting a generator target object should delete the created objects of that target diff --git a/docs/docs/topics/graphql.mdx b/docs/docs/topics/graphql.mdx index 334d584716..f09bdb8fe8 100644 --- a/docs/docs/topics/graphql.mdx +++ b/docs/docs/topics/graphql.mdx @@ -189,11 +189,11 @@ In addition to the queries and the mutations automatically generated based on th - **Mutation**: `BranchMerge`, Merge a branch into main - **Mutation**: `BranchValidate`, Validate if a branch has some conflicts -## GraphQLQuery +## Stored GraphQL queries in the database The `GraphQLQuery` model has been designed to store a GraphQL query in order to simplify its execution and to associate it with other internal objects like `Transformation`. -A `GraphQLQuery` object can be created directly from the API or it can be imported from a Git repository. +A `GraphQLQuery` object can be created via the web interface, the API or it can be imported from a Git repository. Every time a `GraphQLQuery` is created or updated, the content of the query will be analyzed to: @@ -208,6 +208,10 @@ Every time a `GraphQLQuery` is created or updated, the content of the query will - Height, total number of fields requested in the query - List of Infrahub models referenced in the query -### Import from a git repository +### Import from a Git repository -The git agent will automatically try to import all files with the extension `.gql` into a `GraphQLQuery` with the name of the file as the name of the query. +The Git agent will automatically try to import all files with the extension `.gql` into a `GraphQLQuery` with the name of the file as the name of the query. + +### Executing stored GraphQL queries + +Stored GraphQL queries can be executed by using the `/api/query/{query_id}` REST API endpoint. The `{query_id}` can be the name or the id of the `GraphQLQuery` node in the database. More information can be found in the [Swagger documentation](http://localhost:8000/api/docs). diff --git a/docs/docs/topics/hardware-requirements.mdx b/docs/docs/topics/hardware-requirements.mdx index fe7fee1684..2b3de40d9d 100644 --- a/docs/docs/topics/hardware-requirements.mdx +++ b/docs/docs/topics/hardware-requirements.mdx @@ -10,3 +10,37 @@ The system on which you want to run Infrahub, has to meet the following hardware | Recommended | 8 | 16GB | SSD and/or >= 5000 IOPS | If you only want to give Infrahub a try, or follow the [getting started tutorial](/tutorials/getting-started/), then you can use [GitHub Codespaces](/guides/installation#github-codespaces) as an alternative. + +## Performance benchmark utility + +To evaluate the performance of your system, we provide a small utility that will run some performance benchmark of your system's CPU, Memory and disk IOPS. + +:::note + +Even with the right amount of CPU core and memory, there are some other factors that could impact the performance of Infrahub like the speed of your CPU. + +::: + +The tool can run on any system using docker with the following command `docker run --pull always --rm registry.opsmill.io/opsmill/bench` + +```bash title="❯ docker run --pull always --rm registry.opsmill.io/opsmill/bench" + +latest: Pulling from opsmill/bench +09f376ebb190: Already exists +6008598ecd4d: Already exists +b70c7f4d3f19: Pull complete +84e80b988953: Pull complete +Digest: sha256:6f0031a0f61823cca7d319033087f80524eadffa87b1981b2e82d841ada12895 +Status: Downloaded newer image for registry.opsmill.io/opsmill/bench:latest +Running Disk IOPS benchmark... hold on +Running CPU/Memory benchmark... hold on + +Benchmark results: + +Memory: 15611 MB - Required: 8000 MB : OK +CPU Perf: 2337 - Required: 1500 : OK +Disk Read IOPS: 47742 - Required: 5000 : OK +Disk Write IOPS: 15885 - Required: 5000 : OK + +Benchmark completed... +``` diff --git a/docs/docs/topics/infrahub-yml.mdx b/docs/docs/topics/infrahub-yml.mdx index 7b5aeae371..26778c87b0 100644 --- a/docs/docs/topics/infrahub-yml.mdx +++ b/docs/docs/topics/infrahub-yml.mdx @@ -22,6 +22,12 @@ An external repository can be used to link the following Infrahub objects to an ::: +:::note + +To help with the development process of a repository configuration file, you can leverage [schema validation](/reference/schema-validation) within your editor. + +::: + ## GraphQL query {#graphql-query} This is the easiest type of object to link to Infrahub through an external repository because they do not need to be specified in the `.infrahub.yml` file. When Infrahub creates a Repository or pulls changes from the associated external repository, it will scan all the files in the repository and save any that have a `.gql` extension as GraphQLQuery objects in Infrahub. diff --git a/docs/docs/topics/local-demo-environment.mdx b/docs/docs/topics/local-demo-environment.mdx index 7857684fec..8b25efefdb 100644 --- a/docs/docs/topics/local-demo-environment.mdx +++ b/docs/docs/topics/local-demo-environment.mdx @@ -29,7 +29,6 @@ It's designed to be controlled by `invoke` using a list of predefined commands. | **cache** | redis:7.2 | Cache based on Redis, mainly used for distributed lock | | **infrahub-server** | Dockerfile | Instance of the API server, running GraphQL | | **infrahub-git** | Dockerfile | Instance of the Git agent, managing the Git Repository | -| **frontend** | Dockerfile | Instance of the Frontend |
{isProtected ?
+ {isProtected ?
+
@@ -99,12 +100,13 @@ export const OpsSelect2Step = (props: Props) => {
{label} {!isOptional && "*"}
{isProtected &&
{isProtected ?
+ {isProtected ?
+ {isProtected ?
+
+
+
);
}
diff --git a/frontend/src/components/inputs/select.tsx b/frontend/src/components/inputs/select.tsx
index bed8155c9f..9db7163ef8 100644
--- a/frontend/src/components/inputs/select.tsx
+++ b/frontend/src/components/inputs/select.tsx
@@ -1,7 +1,6 @@
import { gql } from "@apollo/client";
import { Combobox } from "@headlessui/react";
import { CheckIcon } from "@heroicons/react/20/solid";
-import { ChevronDownIcon } from "@heroicons/react/24/outline";
import { Icon } from "@iconify-icon/react";
import { useAtomValue } from "jotai/index";
import { useContext, useEffect, useState } from "react";
@@ -32,8 +31,11 @@ import { Input } from "./input";
import { MultipleInput } from "./multiple-input";
import { getObjectDisplayLabel } from "../../graphql/queries/objects/getObjectDisplayLabel";
+import { POOLS_DICTIONNARY, POOLS_PEER } from "../../screens/ipam/constants";
import LoadingScreen from "../../screens/loading-screen/loading-screen";
+import { comparedOptions } from "../../utils/array";
import { getOptionsFromRelationship } from "../../utils/getSchemaObjectColumns";
+import { Tooltip } from "../ui/tooltip";
export type SelectOption = {
id: string | number;
@@ -52,7 +54,7 @@ type SelectProps = {
name?: string;
peer?: string;
options: SelectOption[];
- onChange: (value: SelectOption | SelectOption[]) => void;
+ onChange: (value: any) => void;
disabled?: boolean;
error?: FormFieldError;
direction?: SelectDirection;
@@ -69,9 +71,6 @@ type SelectProps = {
isInherited?: boolean;
};
-// Needed for async options to avoid duplicates issues
-const comparedOptions = (a: SelectOption, b: SelectOption) => a?.id === b?.id;
-
export const Select = (props: SelectProps) => {
const {
options,
@@ -94,7 +93,6 @@ export const Select = (props: SelectProps) => {
isUnique, // Avoid proving useless props
...otherProps
} = props;
-
const { kind } = props;
const { checkSchemaUpdate } = useContext(SchemaContext);
@@ -108,24 +106,45 @@ export const Select = (props: SelectProps) => {
const [open, setOpen] = useState(false);
const [isLoading, setIsLoading] = useState(false);
// TODO: after refactor, find a way to verify the options to trigger or not the request
+ const [hasPoolsBeenOpened, setHasPoolsBeenOpened] = useState(false);
const [hasBeenOpened, setHasBeenOpened] = useState(false);
const [optionToDelete, setOptionToDelete] = useState
+ Empty list
+
+
+ {error?.message && (
+
+ {error?.message}
+
)}
- data-testid="multi-select-input">
- Empty list
-
-
- {loading && {
)}
{canRemoveOption(option.id) && (
-
+
+
+
)}
)}
diff --git a/frontend/src/components/menu/object-help-button.tsx b/frontend/src/components/menu/object-help-button.tsx
index bb03b74a98..e098ef7831 100644
--- a/frontend/src/components/menu/object-help-button.tsx
+++ b/frontend/src/components/menu/object-help-button.tsx
@@ -4,18 +4,19 @@ import {
DropdownMenuItem,
DropdownMenuTrigger,
} from "../ui/dropdown-menu";
-import { Button } from "../buttons/button-primitive";
+import { Button, ButtonProps } from "../buttons/button-primitive";
import { Link } from "react-router-dom";
import { INFRAHUB_DOC_LOCAL } from "../../config/config";
import { Icon } from "@iconify-icon/react";
import { constructPath } from "../../utils/fetch";
-type ObjectHelpButtonProps = {
+interface ObjectHelpButtonProps extends ButtonProps {
+ className?: string;
documentationUrl?: string | null;
kind?: string | null;
-};
+}
-export const ObjectHelpButton = ({ documentationUrl, kind }: ObjectHelpButtonProps) => {
+export const ObjectHelpButton = ({ documentationUrl, kind, ...props }: ObjectHelpButtonProps) => {
const docFullUrl = documentationUrl
? documentationUrl.startsWith("http")
? INFRAHUB_DOC_LOCAL
@@ -25,7 +26,7 @@ export const ObjectHelpButton = ({ documentationUrl, kind }: ObjectHelpButtonPro
return (
+
+ {loading &&
+ {canRequestPools && (
+
+
+
+
)}
-
+
{!loading && finalOptions && finalOptions.length > 0 && (
- = {
export interface KbdProps extends HTMLAttributes {
keys?: KbdKey | KbdKey[];
+ keyClassName?: string;
}
const Kbd = forwardRef((props, ref) => {
- const { children, keys, className } = props;
+ const { children, keys, keyClassName, className } = props;
const keysToRender = typeof keys === "string" ? [keys] : Array.isArray(keys) ? keys : [];
const keysContent = useMemo(() => {
return keysToRender.map((key) => (
-
+
{kbdKeysMap[key]}
));
diff --git a/frontend/src/components/ui/tooltip.tsx b/frontend/src/components/ui/tooltip.tsx
index 44577766fb..0723ddc43c 100644
--- a/frontend/src/components/ui/tooltip.tsx
+++ b/frontend/src/components/ui/tooltip.tsx
@@ -1,8 +1,10 @@
import * as TooltipPrimitives from "@radix-ui/react-tooltip";
-import { ComponentPropsWithoutRef } from "react";
+import { ComponentPropsWithoutRef, ReactNode } from "react";
import { classNames } from "../../utils/common";
-export interface TooltipProps extends ComponentPropsWithoutRef {
+export interface TooltipProps
+ extends Omit, "content"> {
+ content?: ReactNode;
enabled?: boolean;
}
export function Tooltip({
diff --git a/frontend/src/components/utils/alert.tsx b/frontend/src/components/utils/alert.tsx
index 22988d10e6..92cc739920 100644
--- a/frontend/src/components/utils/alert.tsx
+++ b/frontend/src/components/utils/alert.tsx
@@ -27,17 +27,7 @@ type AlertProps = {
};
export const Alert = (props: AlertProps) => {
- const {
- // Toast props
- closeToast,
- // toastProps,
- // Custom props
- message,
- details,
- onDismiss,
- type,
- ...otherProps
- } = props;
+ const { closeToast, message, details, onDismiss, type, ...otherProps } = props;
const getIcon = () => {
switch (type) {
diff --git a/frontend/src/components/utils/pagination.tsx b/frontend/src/components/utils/pagination.tsx
index 00f7141c1d..04b9153b64 100644
--- a/frontend/src/components/utils/pagination.tsx
+++ b/frontend/src/components/utils/pagination.tsx
@@ -1,9 +1,11 @@
import ReactPaginate from "react-paginate";
import usePagination from "../../hooks/usePagination";
import { Select, SelectDirection, SelectOption } from "../inputs/select";
+import { classNames } from "../../utils/common";
type tPaginationType = {
count?: number;
+ className?: string;
};
const limitOptions: SelectOption[] = [
@@ -22,7 +24,7 @@ const limitOptions: SelectOption[] = [
];
export const Pagination = (props: tPaginationType) => {
- const { count = 0 } = props;
+ const { count = 0, className } = props;
const [pagination, setPagination] = usePagination();
@@ -54,13 +56,13 @@ export const Pagination = (props: tPaginationType) => {
setPagination(newPagination);
};
- const handleLimitChange = (newLimit: Number) => {
- if (newLimit === limit) {
+ const handleLimitChange = (newLimit: SelectOption) => {
+ if (newLimit.id === limit) {
return;
}
const newPagination = {
- limit: newLimit,
+ limit: newLimit.id,
offset,
};
@@ -82,7 +84,11 @@ export const Pagination = (props: tPaginationType) => {
);
return (
-
{children}
+
+
);
}
diff --git a/frontend/src/components/ui/kbd.tsx b/frontend/src/components/ui/kbd.tsx
index 57acec6634..6466b05815 100644
--- a/frontend/src/components/ui/kbd.tsx
+++ b/frontend/src/components/ui/kbd.tsx
@@ -35,16 +35,20 @@ export const kbdKeysLabelMap: Record
+ {children}
+
+
+
+
+
+);
diff --git a/frontend/src/screens/artifacts/object-item-details-paginated.tsx b/frontend/src/screens/artifacts/object-item-details-paginated.tsx
index 409fbc34e5..2e46f8f2b4 100644
--- a/frontend/src/screens/artifacts/object-item-details-paginated.tsx
+++ b/frontend/src/screens/artifacts/object-item-details-paginated.tsx
@@ -33,11 +33,11 @@ import {
getSchemaObjectColumns,
getTabs,
} from "../../utils/getSchemaObjectColumns";
-import ErrorScreen from "../error-screen/error-screen";
+import ErrorScreen from "../errors/error-screen";
+import NoDataFound from "../errors/no-data-found";
import AddObjectToGroup from "../groups/add-object-to-group";
import Content from "../layout/content";
import LoadingScreen from "../loading-screen/loading-screen";
-import NoDataFound from "../no-data-found/no-data-found";
import RelationshipDetails from "../object-item-details/relationship-details-paginated";
import { RelationshipsDetails } from "../object-item-details/relationships-details-paginated";
import ObjectItemEditComponent from "../object-item-edit/object-item-edit-paginated";
diff --git a/frontend/src/screens/branches/branch-details.tsx b/frontend/src/screens/branches/branch-details.tsx
index 514758642d..16a6759160 100644
--- a/frontend/src/screens/branches/branch-details.tsx
+++ b/frontend/src/screens/branches/branch-details.tsx
@@ -28,7 +28,7 @@ import { schemaState } from "../../state/atoms/schema.atom";
import { datetimeAtom } from "../../state/atoms/time.atom";
import { objectToString } from "../../utils/common";
import { constructPath, getCurrentQsp } from "../../utils/fetch";
-import ErrorScreen from "../error-screen/error-screen";
+import ErrorScreen from "../errors/error-screen";
import LoadingScreen from "../loading-screen/loading-screen";
import ObjectItemCreate from "../object-item-create/object-item-create-paginated";
import { getFormStructure } from "../proposed-changes/conversations";
diff --git a/frontend/src/screens/branches/branches-items.tsx b/frontend/src/screens/branches/branches-items.tsx
index dfb22f5dea..b6f0811402 100644
--- a/frontend/src/screens/branches/branches-items.tsx
+++ b/frontend/src/screens/branches/branches-items.tsx
@@ -3,6 +3,7 @@ import { useAtom } from "jotai";
import * as R from "ramda";
import { useNavigate } from "react-router-dom";
import { DateDisplay } from "../../components/display/date-display";
+import { Badge } from "../../components/ui/badge";
import { Tooltip } from "../../components/utils/tooltip";
import GET_BRANCHES from "../../graphql/queries/branches/getBranches";
import { useLazyQuery } from "../../hooks/useQuery";
@@ -10,7 +11,6 @@ import { useTitle } from "../../hooks/useTitle";
import { branchesState } from "../../state/atoms/branches.atom";
import { constructPath } from "../../utils/fetch";
import Content from "../layout/content";
-import { Badge } from "../../components/ui/badge";
const BranchesItems = () => {
const [storedBranches, setBranches] = useAtom(branchesState);
@@ -70,12 +70,6 @@ const BranchesItems = () => {
)}
- {branch.is_isolated && (
-
-
- )}
-
{branch.has_schema_changes && (
{
);
}
case "multiselect": {
- return {
diff --git a/frontend/src/screens/error-screen/not-found-screen.tsx b/frontend/src/screens/error-screen/not-found-screen.tsx
deleted file mode 100644
index 350859f0b7..0000000000
--- a/frontend/src/screens/error-screen/not-found-screen.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import notFoundImage from "./images/not-found.webp";
-
-export default function NotFoundScreen() {
- return (
- (null);
diff --git a/frontend/src/screens/ipam/common/utils.ts b/frontend/src/screens/ipam/common/utils.ts
index 93f5382069..1cc8b47d3f 100644
--- a/frontend/src/screens/ipam/common/utils.ts
+++ b/frontend/src/screens/ipam/common/utils.ts
@@ -2,4 +2,4 @@ import { constructPath, overrideQueryParams } from "../../../utils/fetch";
import { IPAM_QSP } from "../constants";
export const constructPathForIpam = (path: string, overrideParams?: overrideQueryParams[]) =>
- constructPath(path, overrideParams, [IPAM_QSP]);
+ constructPath(path, overrideParams, [IPAM_QSP.TAB, IPAM_QSP.NAMESPACE]);
diff --git a/frontend/src/screens/ipam/constants.ts b/frontend/src/screens/ipam/constants.ts
index 12e8b93423..84b516df61 100644
--- a/frontend/src/screens/ipam/constants.ts
+++ b/frontend/src/screens/ipam/constants.ts
@@ -1,5 +1,11 @@
+export const NAMESPACE_GENERIC = "BuiltinIPNamespace";
export const IP_ADDRESS_GENERIC = "BuiltinIPAddress";
export const IP_PREFIX_GENERIC = "BuiltinIPPrefix";
+export const POOLS_PEER = [IP_ADDRESS_GENERIC, IP_PREFIX_GENERIC];
+export const POOLS_DICTIONNARY = {
+ IpamIPAddress: "CoreIPAddressPool",
+ IpamIPPrefix: "CoreIPPrefixPool",
+};
export const IPAM_TREE_ROOT_ID = "root" as const;
@@ -17,7 +23,10 @@ export const IPAM_ROUTE = {
PREFIXES: `${IPAM_BASE_ROUTE}/prefixes`,
} as const;
-export const IPAM_QSP = "ipam-tab";
+export const IPAM_QSP = {
+ TAB: "ipam-tab",
+ NAMESPACE: "namespace",
+};
export const IP_SUMMARY_RELATIONSHIPS_BLACKLIST = [
"ip_addresses",
diff --git a/frontend/src/screens/ipam/ip-addresses/ip-address-summary.tsx b/frontend/src/screens/ipam/ip-addresses/ip-address-summary.tsx
index caca2cee77..1e67eabcef 100644
--- a/frontend/src/screens/ipam/ip-addresses/ip-address-summary.tsx
+++ b/frontend/src/screens/ipam/ip-addresses/ip-address-summary.tsx
@@ -4,16 +4,16 @@ import { useAtomValue } from "jotai/index";
import { useParams } from "react-router-dom";
import { Link } from "../../../components/utils/link";
import { GET_IP_ADDRESS_KIND } from "../../../graphql/queries/ipam/ip-address";
+import { getObjectDetailsPaginated } from "../../../graphql/queries/objects/getObjectDetails";
import useQuery from "../../../hooks/useQuery";
import { genericsState, schemaState } from "../../../state/atoms/schema.atom";
import { getSchemaObjectColumns } from "../../../utils/getSchemaObjectColumns";
-import ErrorScreen from "../../error-screen/error-screen";
+import ErrorScreen from "../../errors/error-screen";
import LoadingScreen from "../../loading-screen/loading-screen";
import { IpDetailsCard } from "../common/ip-details-card";
import { constructPathForIpam } from "../common/utils";
-import { IP_ADDRESS_GENERIC, IPAM_ROUTE } from "../constants";
+import { IPAM_ROUTE, IP_ADDRESS_GENERIC } from "../constants";
import { IpamSummarySkeleton } from "../prefixes/ipam-summary-skeleton";
-import { getObjectDetailsPaginated } from "../../../graphql/queries/objects/getObjectDetails";
export default function IpAddressSummary() {
const { prefix, ip_address } = useParams();
diff --git a/frontend/src/screens/ipam/ip-addresses/ipam-ip-address-list.tsx b/frontend/src/screens/ipam/ip-addresses/ipam-ip-address-list.tsx
index b49ceb103c..da85883ada 100644
--- a/frontend/src/screens/ipam/ip-addresses/ipam-ip-address-list.tsx
+++ b/frontend/src/screens/ipam/ip-addresses/ipam-ip-address-list.tsx
@@ -4,6 +4,7 @@ import { useAtomValue } from "jotai";
import { forwardRef, useImperativeHandle, useState } from "react";
import { useParams } from "react-router-dom";
import { toast } from "react-toastify";
+import { StringParam, useQueryParam } from "use-query-params";
import SlideOver from "../../../components/display/slide-over";
import ModalDelete from "../../../components/modals/modal-delete";
import { Table } from "../../../components/table/table";
@@ -14,11 +15,13 @@ import { DEFAULT_BRANCH_NAME } from "../../../config/constants";
import graphqlClient from "../../../graphql/graphqlClientApollo";
import { deleteObject } from "../../../graphql/mutations/objects/deleteObject";
import { GET_IP_ADDRESSES } from "../../../graphql/queries/ipam/ip-address";
+import { GET_PREFIX_KIND } from "../../../graphql/queries/ipam/prefixes";
import useQuery from "../../../hooks/useQuery";
import { currentBranchAtom } from "../../../state/atoms/branches.atom";
+import { defaultIpNamespaceAtom } from "../common/namespace.state";
import { datetimeAtom } from "../../../state/atoms/time.atom";
import { stringifyWithoutQuotes } from "../../../utils/string";
-import ErrorScreen from "../../error-screen/error-screen";
+import ErrorScreen from "../../errors/error-screen";
import LoadingScreen from "../../loading-screen/loading-screen";
import ObjectItemEditComponent from "../../object-item-edit/object-item-edit-paginated";
import { constructPathForIpam } from "../common/utils";
@@ -29,12 +32,13 @@ import {
IP_ADDRESS_GENERIC,
IP_PREFIX_GENERIC,
} from "../constants";
-import { GET_PREFIX_KIND } from "../../../graphql/queries/ipam/prefixes";
const IpamIPAddressesList = forwardRef((props, ref) => {
const { prefix } = useParams();
+ const [namespace] = useQueryParam(IPAM_QSP.NAMESPACE, StringParam);
const [isLoading, setIsLoading] = useState(false);
const branch = useAtomValue(currentBranchAtom);
+ const defaultIpNamespace = useAtomValue(defaultIpNamespaceAtom);
const date = useAtomValue(datetimeAtom);
const [relatedRowToDelete, setRelatedRowToDelete] = useState();
const [relatedObjectToEdit, setRelatedObjectToEdit] = useState();
@@ -48,12 +52,16 @@ const IpamIPAddressesList = forwardRef((props, ref) => {
};
const { loading, error, data, refetch } = useQuery(GET_IP_ADDRESSES, {
- variables: { prefixIds: prefix ? [prefix] : null },
+ variables: {
+ prefixIds: prefix ? [prefix] : null,
+ namespaces: namespace ? [namespace] : [defaultIpNamespace],
+ },
+ skip: !defaultIpNamespace,
});
const { data: getPrefixKindData } = useQuery(GET_PREFIX_KIND, {
variables: { ids: [prefix] },
- skip: !prefix,
+ skip: !prefix || !defaultIpNamespace,
});
const prefixData = getPrefixKindData?.[IP_PREFIX_GENERIC]?.edges?.[0]?.node;
@@ -119,12 +127,12 @@ const IpamIPAddressesList = forwardRef((props, ref) => {
setRelatedRowToDelete(undefined);
- toast(
+ toast(() => (
diff --git a/frontend/src/screens/ipam/ip-namespace-selector.tsx b/frontend/src/screens/ipam/ip-namespace-selector.tsx
new file mode 100644
index 0000000000..1c922355a7
--- /dev/null
+++ b/frontend/src/screens/ipam/ip-namespace-selector.tsx
@@ -0,0 +1,82 @@
+import { Icon } from "@iconify-icon/react";
+import { useAtom } from "jotai";
+import { useEffect } from "react";
+import { useNavigate, useParams } from "react-router-dom";
+import { StringParam, useQueryParam } from "use-query-params";
+import { Select, SelectOption } from "../../components/inputs/select";
+import { Skeleton } from "../../components/skeleton";
+import { GET_IP_NAMESPACES } from "../../graphql/queries/ipam/ip-namespaces";
+import useQuery from "../../hooks/useQuery";
+import { defaultIpNamespaceAtom } from "./common/namespace.state";
+import { constructPathForIpam } from "./common/utils";
+import { IPAM_QSP, IPAM_ROUTE, IPAM_TABS, NAMESPACE_GENERIC } from "./constants";
+
+export default function IpNamespaceSelector() {
+ const { loading, data } = useQuery(GET_IP_NAMESPACES);
+
+ if (loading) {
+ return ;
+ defaultNamespace: any;
+};
+
+const IpNamespaceSelectorContent = ({
+ namespaces,
+ defaultNamespace,
+}: IpNamespaceSelectorContentProps) => {
+ const { prefix, ip_address } = useParams();
+ const navigate = useNavigate();
+ const [ipamTab] = useQueryParam(IPAM_QSP.TAB, StringParam);
+ const [namespaceQSP, setNamespaceQSP] = useQueryParam(IPAM_QSP.NAMESPACE, StringParam);
+ const [defaultIpNamespace, setDefaultIpNamespace] = useAtom(defaultIpNamespaceAtom);
+
+ useEffect(() => {
+ setDefaultIpNamespace(defaultNamespace.id);
+ }, []);
+
+ const handleNamespaceChange = (newValue: SelectOption) => {
+ if (!newValue?.id || newValue?.id === defaultIpNamespace) {
+ setNamespaceQSP(undefined); // Removes QSP for default namespace
+ } else {
+ setNamespaceQSP(newValue.id);
+ }
+
+ if (prefix || ip_address) {
+ // Redirects to main lists on namespace switch
+ if (ipamTab === IPAM_TABS.IP_DETAILS) {
+ // Redirects to main IP Addresses view
+ navigate(constructPathForIpam(IPAM_ROUTE.ADDRESSES));
+ } else {
+ // Redirects to main Prefixes view
+ navigate(constructPathForIpam(IPAM_ROUTE.PREFIXES));
+ }
+ }
+ };
+
+ return (
+
+
diff --git a/frontend/src/screens/ipam/ipam-router.tsx b/frontend/src/screens/ipam/ipam-router.tsx
index dea4ed6b5c..c829086b1d 100644
--- a/frontend/src/screens/ipam/ipam-router.tsx
+++ b/frontend/src/screens/ipam/ipam-router.tsx
@@ -1,5 +1,5 @@
import { Icon } from "@iconify-icon/react";
-import { useAtomValue } from "jotai";
+import { useAtomValue, useSetAtom } from "jotai";
import { useRef, useState } from "react";
import { useNavigate, useParams } from "react-router-dom";
import { StringParam, useQueryParam } from "use-query-params";
@@ -11,6 +11,7 @@ import { DEFAULT_BRANCH_NAME } from "../../config/constants";
import { usePermission } from "../../hooks/usePermission";
import { currentBranchAtom } from "../../state/atoms/branches.atom";
import { genericsState, schemaState } from "../../state/atoms/schema.atom";
+import { constructPath } from "../../utils/fetch";
import ObjectItemCreate from "../object-item-create/object-item-create-paginated";
import {
IPAM_QSP,
@@ -20,8 +21,9 @@ import {
IP_PREFIX_GENERIC,
} from "./constants";
import IpamIPAddresses from "./ip-addresses/ipam-ip-address";
+import { reloadIpamTreeAtom } from "./ipam-tree/ipam-tree.state";
import IpamIPPrefixes from "./prefixes/ipam-prefixes";
-import { constructPath } from "../../utils/fetch";
+import { defaultIpNamespaceAtom } from "./common/namespace.state";
const tabToKind = {
[IPAM_TABS.IP_DETAILS]: IP_ADDRESS_GENERIC,
@@ -29,13 +31,16 @@ const tabToKind = {
};
export default function IpamRouter() {
- const [qspTab] = useQueryParam(IPAM_QSP, StringParam);
+ const [qspTab] = useQueryParam(IPAM_QSP.TAB, StringParam);
const navigate = useNavigate();
const { prefix } = useParams();
const permission = usePermission();
const branch = useAtomValue(currentBranchAtom);
const schemaList = useAtomValue(schemaState);
const genericList = useAtomValue(genericsState);
+ const [namespace] = useQueryParam(IPAM_QSP.NAMESPACE, StringParam);
+ const defaultIpNamespace = useAtomValue(defaultIpNamespaceAtom);
+ const reloadIpamTree = useSetAtom(reloadIpamTreeAtom);
const refetchRef = useRef(null);
const objectname = qspTab ? tabToKind[qspTab] : IP_PREFIX_GENERIC;
@@ -51,11 +56,11 @@ export default function IpamRouter() {
name: IPAM_TABS.SUMMARY,
onClick: () => {
if (prefix) {
- navigate(constructPath(`${IPAM_ROUTE.PREFIXES}/${prefix}`));
+ navigate(constructPath(`${IPAM_ROUTE.PREFIXES}/${prefix}`, [], [IPAM_QSP.NAMESPACE]));
return;
}
- navigate(constructPath(IPAM_ROUTE.PREFIXES));
+ navigate(constructPath(IPAM_ROUTE.PREFIXES, [], [IPAM_QSP.NAMESPACE]));
return;
},
},
@@ -64,9 +69,11 @@ export default function IpamRouter() {
name: IPAM_TABS.PREFIX_DETAILS,
onClick: () => {
navigate(
- constructPath(prefix ? `${IPAM_ROUTE.PREFIXES}/${prefix}` : IPAM_ROUTE.PREFIXES, [
- { name: IPAM_QSP, value: IPAM_TABS.PREFIX_DETAILS },
- ])
+ constructPath(
+ prefix ? `${IPAM_ROUTE.PREFIXES}/${prefix}` : IPAM_ROUTE.PREFIXES,
+ [{ name: IPAM_QSP.TAB, value: IPAM_TABS.PREFIX_DETAILS }],
+ [IPAM_QSP.NAMESPACE]
+ )
);
return;
},
@@ -77,15 +84,21 @@ export default function IpamRouter() {
onClick: () => {
if (prefix) {
navigate(
- constructPath(`${IPAM_ROUTE.PREFIXES}/${prefix}`, [
- { name: IPAM_QSP, value: IPAM_TABS.IP_DETAILS },
- ])
+ constructPath(
+ `${IPAM_ROUTE.PREFIXES}/${prefix}`,
+ [{ name: IPAM_QSP.TAB, value: IPAM_TABS.IP_DETAILS }],
+ [IPAM_QSP.NAMESPACE]
+ )
);
return;
}
navigate(
- constructPath(IPAM_ROUTE.ADDRESSES, [{ name: IPAM_QSP, value: IPAM_TABS.IP_DETAILS }])
+ constructPath(
+ IPAM_ROUTE.ADDRESSES,
+ [{ name: IPAM_QSP.TAB, value: IPAM_TABS.IP_DETAILS }],
+ [IPAM_QSP.NAMESPACE]
+ )
);
return;
},
@@ -119,7 +132,7 @@ export default function IpamRouter() {
return (
- setShowCreateDrawer(false)}
+ onCreate={() => {
+ setShowCreateDrawer(false);
+
+ const currentIpNamespace = namespace ?? defaultIpNamespace;
+ if (currentIpNamespace) {
+ reloadIpamTree(currentIpNamespace, prefix);
+ }
+ }}
onCancel={() => setShowCreateDrawer(false)}
objectname={objectname!}
refetch={refetchRef?.current?.refetch}
diff --git a/frontend/src/screens/ipam/ipam-tree/ipam-tree.state.ts b/frontend/src/screens/ipam/ipam-tree/ipam-tree.state.ts
new file mode 100644
index 0000000000..736fbcf3c1
--- /dev/null
+++ b/frontend/src/screens/ipam/ipam-tree/ipam-tree.state.ts
@@ -0,0 +1,126 @@
+import { atom } from "jotai";
+import * as R from "ramda";
+import { TreeProps } from "../../../components/ui/tree";
+import graphqlClient from "../../../graphql/graphqlClientApollo";
+import {
+ GET_PREFIX_ANCESTORS,
+ GET_PREFIXES_ONLY,
+ GET_TOP_LEVEL_PREFIXES,
+} from "../../../graphql/queries/ipam/prefixes";
+import { currentBranchAtom } from "../../../state/atoms/branches.atom";
+import { datetimeAtom } from "../../../state/atoms/time.atom";
+import { IP_PREFIX_GENERIC, IPAM_TREE_ROOT_ID } from "../constants";
+import {
+ AncestorsData,
+ EMPTY_IPAM_TREE,
+ formatIPPrefixResponseForTreeView,
+ PrefixData,
+ updateTreeData,
+} from "./utils";
+
+export const ipamTreeAtom = atom(EMPTY_IPAM_TREE);
+
+export const reloadIpamTreeAtom = atom(
+ null,
+ async (get, set, namespaceId: string, currentPrefixId?: string) => {
+ const currentIpamTree = get(ipamTreeAtom);
+ const currentBranch = get(currentBranchAtom);
+ const timeMachineDate = get(datetimeAtom);
+
+ const { data: getTopLevelPrefixData } = await graphqlClient.query({
+ query: GET_TOP_LEVEL_PREFIXES,
+ variables: { namespaces: [namespaceId] },
+ context: {
+ branch: currentBranch?.name,
+ date: timeMachineDate,
+ },
+ });
+
+ if (!getTopLevelPrefixData) return currentIpamTree;
+
+ const topLevelTreeItems = formatIPPrefixResponseForTreeView(getTopLevelPrefixData);
+ const treeWithTopLevelPrefixesOnly = updateTreeData(
+ EMPTY_IPAM_TREE,
+ IPAM_TREE_ROOT_ID,
+ topLevelTreeItems
+ );
+
+ if (!currentPrefixId) {
+ set(ipamTreeAtom, treeWithTopLevelPrefixesOnly);
+ return treeWithTopLevelPrefixesOnly;
+ }
+
+ const { data: getFetchPrefixAncestorsData } = await graphqlClient.query({
+ query: GET_PREFIX_ANCESTORS,
+ context: {
+ branch: currentBranch?.name,
+ date: timeMachineDate,
+ },
+ variables: {
+ ids: [currentPrefixId],
+ namespaces: [namespaceId],
+ },
+ });
+
+ const prefixAncestorsData = getFetchPrefixAncestorsData[IP_PREFIX_GENERIC].edges[0];
+ if (!prefixAncestorsData) {
+ console.error(`Prefix ${currentPrefixId} not found.`);
+ set(ipamTreeAtom, treeWithTopLevelPrefixesOnly);
+ return treeWithTopLevelPrefixesOnly;
+ }
+
+ const ancestors = prefixAncestorsData.node.ancestors.edges.map(({ node }) => ({
+ id: node.id,
+ name: node.display_label,
+ parentId: node.parent.node?.id ?? IPAM_TREE_ROOT_ID,
+ }));
+
+ const parentToChildMap: Record = {};
+
+ ancestors.forEach(({ id, parentId }) => {
+ parentToChildMap[parentId] = id;
+ });
+
+ const orderedAncestorIds: string[] = [];
+
+ const traverseHierarchy = (map: Record, parentId: string) => {
+ const childId = map[parentId];
+ if (!childId) return;
+
+ orderedAncestorIds.push(childId);
+ traverseHierarchy(map, childId);
+ };
+
+ traverseHierarchy(parentToChildMap, IPAM_TREE_ROOT_ID);
+
+ const { data: getFetchPrefixesData } = await graphqlClient.query<
+ PrefixData,
+ { parentIds: string[] }
+ >({
+ query: GET_PREFIXES_ONLY,
+ context: {
+ branch: currentBranch?.name,
+ date: timeMachineDate,
+ },
+ variables: {
+ parentIds: [...orderedAncestorIds, currentPrefixId],
+ },
+ });
+
+ const newtreeItems = formatIPPrefixResponseForTreeView(getFetchPrefixesData);
+
+ const groupedByParent = R.groupBy(
+ (node) => node.parent?.toString() ?? IPAM_TREE_ROOT_ID,
+ newtreeItems
+ );
+
+ const newTree = [...orderedAncestorIds, currentPrefixId].reduce((acc, currentAncestorId) => {
+ const children = groupedByParent[currentAncestorId];
+ if (!children) return acc;
+ return updateTreeData(acc, currentAncestorId, children);
+ }, treeWithTopLevelPrefixesOnly);
+
+ set(ipamTreeAtom, newTree);
+ return newTree;
+ }
+);
diff --git a/frontend/src/screens/ipam/ipam-tree/ipam-tree.tsx b/frontend/src/screens/ipam/ipam-tree/ipam-tree.tsx
index 6c4c57a57a..9c8d5da15f 100644
--- a/frontend/src/screens/ipam/ipam-tree/ipam-tree.tsx
+++ b/frontend/src/screens/ipam/ipam-tree/ipam-tree.tsx
@@ -1,124 +1,49 @@
-import { TreeItemProps, Tree } from "../../../components/ui/tree";
-import { useLazyQuery } from "../../../hooks/useQuery";
-import React, { useEffect, useState } from "react";
+import { Icon } from "@iconify-icon/react";
+import { useAtom, useAtomValue, useSetAtom } from "jotai";
+import { useEffect, useState } from "react";
import { ITreeViewOnLoadDataProps, NodeId } from "react-accessible-treeview";
import { Link, useNavigate, useParams } from "react-router-dom";
-import { Icon } from "@iconify-icon/react";
-import * as R from "ramda";
+import { Tree, TreeItemProps } from "../../../components/ui/tree";
+import { useLazyQuery } from "../../../hooks/useQuery";
-import {
- GET_PREFIX_ANCESTORS,
- GET_PREFIXES_ONLY,
- GET_TOP_LEVEL_PREFIXES,
-} from "../../../graphql/queries/ipam/prefixes";
-import { useAtomValue } from "jotai/index";
+import { StringParam, useQueryParam } from "use-query-params";
+import { GET_PREFIXES_ONLY } from "../../../graphql/queries/ipam/prefixes";
+import { defaultIpNamespaceAtom } from "../common/namespace.state";
import { genericsState, schemaState } from "../../../state/atoms/schema.atom";
import { constructPathForIpam } from "../common/utils";
+import { IPAM_QSP, IPAM_ROUTE } from "../constants";
import { IpamTreeSkeleton } from "./ipam-tree-skeleton";
-import { IP_PREFIX_GENERIC, IPAM_ROUTE, IPAM_TREE_ROOT_ID } from "../constants";
+import { ipamTreeAtom, reloadIpamTreeAtom } from "./ipam-tree.state";
import {
- AncestorsData,
- EMPTY_IPAM_TREE,
- formatIPPrefixResponseForTreeView,
PrefixData,
+ formatIPPrefixResponseForTreeView,
+ getTreeItemAncestors,
updateTreeData,
} from "./utils";
export default function IpamTree() {
const { prefix } = useParams();
- const [selected, setSelected] = useState([]);
+ const [namespace] = useQueryParam(IPAM_QSP.NAMESPACE, StringParam);
+ const defaultIpNamespace = useAtomValue(defaultIpNamespaceAtom);
+ const [expandedIds, setExpandedIds] = useState([]);
const [isLoading, setLoading] = useState(true);
- const [treeData, setTreeData] = useState(EMPTY_IPAM_TREE);
- const [fetchTopLevelIpPrefixes] = useLazyQuery(GET_TOP_LEVEL_PREFIXES);
- const [fetchPrefixAncestors] = useLazyQuery(GET_PREFIX_ANCESTORS);
+ const [treeData, setTreeData] = useAtom(ipamTreeAtom);
+ const reloadIpamTree = useSetAtom(reloadIpamTreeAtom);
const [fetchPrefixes] = useLazyQuery(GET_PREFIXES_ONLY);
const navigate = useNavigate();
useEffect(() => {
- fetchTopLevelIpPrefixes()
- .then(({ data }) => {
- if (!data) return;
-
- const topLevelTreeItems = formatIPPrefixResponseForTreeView(data);
-
- // assign all prefixes and IP addresses without parent to the root node
- return updateTreeData(EMPTY_IPAM_TREE, IPAM_TREE_ROOT_ID, topLevelTreeItems);
- })
- .then((tree) => {
- if (!tree) return;
-
- if (!prefix) {
- setTreeData(tree);
- setLoading(false);
- return;
- }
-
- fetchPrefixAncestors({ variables: { ids: [prefix] } })
- .then(({ data }) => {
- if (!data) return;
-
- const prefixAncestorsData = data[IP_PREFIX_GENERIC].edges[0];
-
- if (!prefixAncestorsData) {
- setTreeData(tree);
- setLoading(false);
- return;
- }
-
- const ancestors = prefixAncestorsData.node.ancestors.edges.map(({ node }) => ({
- id: node.id,
- name: node.display_label,
- parentId: node.parent.node?.id ?? IPAM_TREE_ROOT_ID,
- }));
-
- const parentToChildMap: Record = {};
-
- ancestors.forEach(({ id, parentId }) => {
- parentToChildMap[parentId] = id;
- });
-
- const orderedAncestorIds: string[] = [];
-
- const traverseHierarchy = (map: Record, parentId: string) => {
- const childId = map[parentId];
- if (!childId) return;
-
- orderedAncestorIds.push(childId);
- traverseHierarchy(map, childId);
- };
-
- traverseHierarchy(parentToChildMap, IPAM_TREE_ROOT_ID);
-
- return orderedAncestorIds;
- })
- .then((orderedAncestorIds) => {
- if (!orderedAncestorIds) return;
-
- fetchPrefixes({ variables: { parentIds: orderedAncestorIds } }).then(({ data }) => {
- if (!data) return;
-
- const treeItems = formatIPPrefixResponseForTreeView(data);
- const groupedByParent = R.groupBy(
- (node) => node.parent?.toString() ?? IPAM_TREE_ROOT_ID,
- treeItems
- );
-
- const newTree = orderedAncestorIds.reduce((acc, currentAncestorId) => {
- const children = groupedByParent[currentAncestorId];
- if (!children) return acc;
- return updateTreeData(acc, currentAncestorId, children);
- }, tree);
-
- const currentPrefix = newTree.find(({ id }) => id === prefix);
- setTreeData(newTree);
- setSelected(
- currentPrefix ? [...orderedAncestorIds, currentPrefix.id] : orderedAncestorIds
- );
- setLoading(false);
- });
- });
- });
- }, []);
+ const currentIpNamespace = namespace ?? defaultIpNamespace;
+ if (!currentIpNamespace) return;
+
+ reloadIpamTree(currentIpNamespace, prefix).then((newTree) => {
+ if (prefix) {
+ const ancestorIds = getTreeItemAncestors(newTree, prefix).map(({ id }) => id);
+ setExpandedIds(ancestorIds);
+ }
+ setLoading(false);
+ });
+ }, [namespace, defaultIpNamespace]);
const onLoadData = async ({ element }: ITreeViewOnLoadDataProps) => {
if (element.children.length > 0) return; // To avoid refetching data
@@ -135,7 +60,7 @@ export default function IpamTree() {
return (
{paginationText}
diff --git a/frontend/src/config/constants.tsx b/frontend/src/config/constants.tsx
index 0ce2bafa91..bfd941c121 100644
--- a/frontend/src/config/constants.tsx
+++ b/frontend/src/config/constants.tsx
@@ -28,10 +28,10 @@ export const PROPOSED_CHANGES_THREAD_OBJECT = "CoreThread";
export const PROPOSED_CHANGES_CHANGE_THREAD_OBJECT = "CoreChangeThread";
-export const PROPOSED_CHANGES_FILE_THREAD_OBJECT = "CoreFileThread";
-
export const PROPOSED_CHANGES_OBJECT_THREAD_OBJECT = "CoreObjectThread";
+export const PROPOSED_CHANGES_FILE_THREAD_OBJECT = "CoreFileThread";
+
export const ARTIFACT_OBJECT = "CoreArtifact";
export const PROPOSED_CHANGES_ARTIFACT_THREAD_OBJECT = "CoreArtifactThread";
@@ -128,6 +128,7 @@ export const VALIDATIONS_ENUM_MAP: { [key: string]: string } = {
};
export const MAX_VALUE_LENGTH_DISPLAY = 40;
+export const MAX_PASSWORD_DOTS_DISPLAY = 20;
export const attributesKindForListView = [
"Text",
diff --git a/frontend/src/graphql/mutations/branches/createBranch.ts b/frontend/src/graphql/mutations/branches/createBranch.ts
index 1111af76a7..22808f1d00 100644
--- a/frontend/src/graphql/mutations/branches/createBranch.ts
+++ b/frontend/src/graphql/mutations/branches/createBranch.ts
@@ -1,20 +1,8 @@
import { gql } from "@apollo/client";
export const BRANCH_CREATE = gql`
- mutation BranchCreate(
- $name: String!
- $description: String!
- $sync_with_git: Boolean!
- $is_isolated: Boolean!
- ) {
- BranchCreate(
- data: {
- name: $name
- description: $description
- sync_with_git: $sync_with_git
- is_isolated: $is_isolated
- }
- ) {
+ mutation BranchCreate($name: String!, $description: String!, $sync_with_git: Boolean!) {
+ BranchCreate(data: { name: $name, description: $description, sync_with_git: $sync_with_git }) {
object {
id
name
diff --git a/frontend/src/graphql/queries/branches/getBranches.ts b/frontend/src/graphql/queries/branches/getBranches.ts
index 4c15fd9267..d48843463c 100644
--- a/frontend/src/graphql/queries/branches/getBranches.ts
+++ b/frontend/src/graphql/queries/branches/getBranches.ts
@@ -16,7 +16,6 @@ const GET_BRANCHES = gql`
created_at
sync_with_git
is_default
- is_isolated
has_schema_changes
}
}
diff --git a/frontend/src/graphql/queries/ipam/ip-address.ts b/frontend/src/graphql/queries/ipam/ip-address.ts
index e5181ce5ac..e226204541 100644
--- a/frontend/src/graphql/queries/ipam/ip-address.ts
+++ b/frontend/src/graphql/queries/ipam/ip-address.ts
@@ -15,10 +15,17 @@ export const GET_IP_ADDRESS_KIND = gql`
`;
export const GET_IP_ADDRESSES = gql`
- query GET_IP_ADDRESSES($prefixIds: [ID], $ipaddress: String, $offset: Int, $limit: Int) {
+ query GET_IP_ADDRESSES(
+ $prefixIds: [ID]
+ $ipaddress: String
+ $namespaces: [ID]
+ $offset: Int
+ $limit: Int
+ ) {
BuiltinIPAddress(
ip_prefix__ids: $prefixIds
address__value: $ipaddress
+ ip_namespace__ids: $namespaces
offset: $offset
limit: $limit
) {
diff --git a/frontend/src/graphql/queries/ipam/ip-namespaces.ts b/frontend/src/graphql/queries/ipam/ip-namespaces.ts
new file mode 100644
index 0000000000..5c0ed44954
--- /dev/null
+++ b/frontend/src/graphql/queries/ipam/ip-namespaces.ts
@@ -0,0 +1,25 @@
+import { gql } from "@apollo/client";
+
+export const GET_IP_NAMESPACES = gql`
+ query BuiltinIPNamespace {
+ BuiltinIPNamespace {
+ edges {
+ node {
+ display_label
+ id
+ name {
+ id
+ }
+ description {
+ id
+ }
+ ... on IpamNamespace {
+ default {
+ value
+ }
+ }
+ }
+ }
+ }
+ }
+`;
diff --git a/frontend/src/graphql/queries/ipam/namespaces.ts b/frontend/src/graphql/queries/ipam/namespaces.ts
deleted file mode 100644
index f139e75755..0000000000
--- a/frontend/src/graphql/queries/ipam/namespaces.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { gql } from "@apollo/client";
-
-export const GET_NAMESPACES = gql`
- query IpamIPNamespace {
- IpamIPNamespace {
- edges {
- node {
- display_label
- id
- name {
- id
- }
- description {
- id
- }
- }
- }
- }
- }
- }
-`;
diff --git a/frontend/src/graphql/queries/ipam/prefixes.ts b/frontend/src/graphql/queries/ipam/prefixes.ts
index fbb3392d81..11f146191d 100644
--- a/frontend/src/graphql/queries/ipam/prefixes.ts
+++ b/frontend/src/graphql/queries/ipam/prefixes.ts
@@ -22,8 +22,8 @@ export const GET_PREFIXES_ONLY = gql`
`;
export const GET_PREFIXES = gql`
- query GET_PREFIXES($namespace: String, $offset: Int, $limit: Int) {
- BuiltinIPPrefix(ip_namespace__name__value: $namespace, offset: $offset, limit: $limit) {
+ query GET_PREFIXES($namespaces: [ID], $offset: Int, $limit: Int) {
+ BuiltinIPPrefix(ip_namespace__ids: $namespaces, offset: $offset, limit: $limit) {
count
edges {
node {
@@ -171,8 +171,8 @@ export const GET_PREFIX_KIND = gql`
`;
export const GET_TOP_LEVEL_PREFIXES = gql`
- query GET_TOP_LEVEL_PREFIXES {
- BuiltinIPPrefix(is_top_level__value: true) {
+ query GET_TOP_LEVEL_PREFIXES($namespaces: [ID]) {
+ BuiltinIPPrefix(is_top_level__value: true, ip_namespace__ids: $namespaces) {
edges {
node {
id
@@ -192,8 +192,8 @@ export const GET_TOP_LEVEL_PREFIXES = gql`
`;
export const GET_PREFIX_ANCESTORS = gql`
- query GET_PREFIX_ANCESTORS($ids: [ID]) {
- BuiltinIPPrefix(ids: $ids) {
+ query GET_PREFIX_ANCESTORS($ids: [ID], $namespaces: [ID]) {
+ BuiltinIPPrefix(ids: $ids, ip_namespace__ids: $namespaces) {
edges {
node {
id
diff --git a/frontend/src/graphql/queries/objects/getObjectDetails.ts b/frontend/src/graphql/queries/objects/getObjectDetails.ts
index 5679dde17f..34ac3353b1 100644
--- a/frontend/src/graphql/queries/objects/getObjectDetails.ts
+++ b/frontend/src/graphql/queries/objects/getObjectDetails.ts
@@ -3,7 +3,7 @@ import "../../../utils/handlebars"; // Import handlebars utils
export const getObjectDetailsPaginated = Handlebars.compile(`
query {{kind}} {
- {{kind}} (ids: ["{{objectid}}"]) {
+ {{kind}} (ids: ["{{objectid}}"] {{#if filters}} {{{filters}}} {{/if}}) {
edges {
node {
id
diff --git a/frontend/src/graphql/queries/objects/getObjectRelationshipDetails.ts b/frontend/src/graphql/queries/objects/getObjectRelationshipDetails.ts
index ce4c41aa04..b9d7f93cd1 100644
--- a/frontend/src/graphql/queries/objects/getObjectRelationshipDetails.ts
+++ b/frontend/src/graphql/queries/objects/getObjectRelationshipDetails.ts
@@ -1,12 +1,15 @@
import Handlebars from "handlebars";
export const getObjectRelationshipsDetailsPaginated = Handlebars.compile(`
-query GetObjectRelationships_{{kind}} {
+query GetObjectRelationships_{{kind}}($offset: Int, $limit: Int) {
{{kind}} (ids: ["{{objectid}}"]) {
count
edges {
node {
- {{relationship}}{{#if filters}}({{{filters}}}){{/if}} {
+ {{relationship}}(
+ offset: $offset
+ limit: $limit
+ ) {
count
edges {
node {
@@ -14,38 +17,59 @@ query GetObjectRelationships_{{kind}} {
display_label
__typename
- {{#each columns}}
+ {{#if relationshipKind}} ... on {{relationshipKind}} { {{/if}}
- {{#if this.isAttribute}}
+ {{#each columns}}
+
+ {{#if this.isAttribute}}
+
+ {{this.name}} {
+ value
+ {{#if (eq this.kind "Dropdown")}}
+ color
+ description
+ label
+ {{/if}}
+ }
- {{this.name}} {
- value
- {{#if (eq this.kind "Dropdown")}}
- color
- description
- label
{{/if}}
- }
- {{/if}}
+ {{#if this.isRelationship}}
- {{#if this.isRelationship}}
+ {{this.name}} {
+ {{#if this.paginated}}
+ edges {
+ {{/if}}
+ node {
+ display_label
+ }
+ {{#if this.paginated}}
+ }
+ {{/if}}
+ }
- {{this.name}} {
- {{#if this.paginated}}
- edges {
{{/if}}
- node {
- display_label
- }
- {{#if this.paginated}}
- }
- {{/if}}
- }
- {{/if}}
+ {{/each}}
+
+ {{#if relationshipKind}} } {{/if}}
- {{/each}}
+ }
+
+ properties {
+ updated_at
+ is_protected
+ is_visible
+ source {
+ id
+ display_label
+ __typename
+ }
+ owner {
+ id
+ display_label
+ __typename
+ }
}
properties {
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 68001c60bb..cd5632b9b7 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -1,6 +1,16 @@
import React from "react";
import ReactDOM from "react-dom/client";
+import { ErrorBoundary } from "react-error-boundary";
+import { Provider } from "jotai";
import { Infrahub } from "./";
+import { store } from "./state";
+import ErrorFallback from "./screens/errors/error-fallback";
// https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react#consistent-components-exports
-ReactDOM.createRoot(document.getElementById("root")!).render(
- 
-
- );
-}
diff --git a/frontend/src/screens/errors/error-fallback.tsx b/frontend/src/screens/errors/error-fallback.tsx
new file mode 100644
index 0000000000..60b75ca597
--- /dev/null
+++ b/frontend/src/screens/errors/error-fallback.tsx
@@ -0,0 +1,114 @@
+import { useErrorBoundary } from "react-error-boundary";
+import React, { useEffect, useState } from "react";
+import { Card } from "../../components/ui/card";
+import { Icon } from "@iconify-icon/react";
+import { Button } from "../../components/buttons/button-primitive";
+import Kbd from "../../components/ui/kbd";
+import Accordion from "../../components/display/accordion";
+
+type ErrorFallbackProps = {
+ error: Error;
+};
+function ErrorFallback({ error }: ErrorFallbackProps) {
+ const { resetBoundary } = useErrorBoundary();
+ const [bugPosition, setBugPosition] = useState({ top: 0, left: 0 });
+
+ useEffect(() => {
+ const onKeydown = (event: KeyboardEvent) => {
+ if (event.key.toLowerCase() === "enter") {
+ resetBoundary();
+ }
+ console.error(event.key);
+ if (event.key.toLowerCase() === "backspace") {
+ window.location.href = window.location.origin;
+ }
+ };
+
+ document.addEventListener("keydown", onKeydown);
+ return () => document.removeEventListener("keydown", onKeydown);
+ }, []);
+
+ const handleMoveOnBug = () => {
+ const randomTop = bugPosition.top + Math.floor(Math.random() * 100) - 50;
+ const randomLeft = bugPosition.left + Math.floor(Math.random() * 100) - 50;
+
+ setBugPosition({
+ top: randomTop,
+ left: randomLeft,
+ });
+ };
+
+ return (
+ 404 not found
-
+
+
+
+ {error.stack && (
+
+
+ )}
+
+ );
+}
+
+export default ErrorFallback;
diff --git a/frontend/src/screens/error-screen/error-screen.tsx b/frontend/src/screens/errors/error-screen.tsx
similarity index 57%
rename from frontend/src/screens/error-screen/error-screen.tsx
rename to frontend/src/screens/errors/error-screen.tsx
index a0d4ea5f99..a5558a8ee8 100644
--- a/frontend/src/screens/error-screen/error-screen.tsx
+++ b/frontend/src/screens/errors/error-screen.tsx
@@ -1,4 +1,4 @@
-import { ExclamationCircleIcon } from "@heroicons/react/24/outline";
+import { Icon } from "@iconify-icon/react";
import { ReactElement } from "react";
type tNoData = {
@@ -13,10 +13,10 @@ export default function ErrorScreen(props: tNoData) {
return (
Uh-oh, something went wrong :(
+ +
+
+
+ You might have encounter a{" "}
+
+
+
+
+
+
+
+ + Press{" "} + + enter + {" "} + to try again +
++ Press{" "} + + backspace + {" "} + to go back to Homepage +
++ If this was unexpected, please reach out to us on{" "} + + Discord + + {" or "} + + GitHub + +
+{error.stack}
+
-
diff --git a/frontend/src/screens/ipam/common/namespace.state.ts b/frontend/src/screens/ipam/common/namespace.state.ts
new file mode 100644
index 0000000000..90684e5146
--- /dev/null
+++ b/frontend/src/screens/ipam/common/namespace.state.ts
@@ -0,0 +1,3 @@
+import { atom } from "jotai";
+
+export const defaultIpNamespaceAtom = atom
- {icon ||
);
}
diff --git a/frontend/src/screens/errors/no-data-found.tsx b/frontend/src/screens/errors/no-data-found.tsx
new file mode 100644
index 0000000000..40e45c120a
--- /dev/null
+++ b/frontend/src/screens/errors/no-data-found.tsx
@@ -0,0 +1,22 @@
+import { Icon } from "@iconify-icon/react";
+import { ReactElement } from "react";
+
+type tNoData = {
+ message?: string;
+ icon?: ReactElement;
+};
+
+const DEFAULT_MESSAGE = "Sorry, no data found.";
+
+export default function NoDataFound(props: tNoData) {
+ const { message, icon } = props;
+
+ return (
+
+ {icon ||
- {message ?? DEFAULT_MESSAGE}
+ {message ?? DEFAULT_MESSAGE}
+
+ );
+}
diff --git a/frontend/src/screens/groups/add-object-to-group.tsx b/frontend/src/screens/groups/add-object-to-group.tsx
index cd07528842..48c6c420fa 100644
--- a/frontend/src/screens/groups/add-object-to-group.tsx
+++ b/frontend/src/screens/groups/add-object-to-group.tsx
@@ -13,12 +13,11 @@ import useQuery from "../../hooks/useQuery";
import { currentBranchAtom } from "../../state/atoms/branches.atom";
import { genericsState, profilesAtom, schemaState } from "../../state/atoms/schema.atom";
import { datetimeAtom } from "../../state/atoms/time.atom";
-import { getFormStructureForAddObjectToGroup } from "../../utils/formStructureForAddObjectToGroup";
import { stringifyWithoutQuotes } from "../../utils/string";
import EditFormHookComponent from "../edit-form-hook/edit-form-hook-component";
-import ErrorScreen from "../error-screen/error-screen";
+import ErrorScreen from "../errors/error-screen";
+import NoDataFound from "../errors/no-data-found";
import LoadingScreen from "../loading-screen/loading-screen";
-import NoDataFound from "../no-data-found/no-data-found";
interface Props {
closeDrawer: Function;
@@ -79,26 +78,45 @@ export default function AddObjectToGroup(props: Props) {
(edge: any) => edge.node
);
- const formStructure = getFormStructureForAddObjectToGroup(groups, objectGroups);
+ const values = objectGroups.map((group) => ({ id: group.id }));
+
+ const options = groups.map((group) => ({
+ id: group.id,
+ name: group?.label?.value,
+ }));
+
+ const formStructure = [
+ {
+ label: "Group",
+ name: "groupids",
+ value: values,
+ type: "multiselect",
+ options,
+ },
+ ];
async function onSubmit(data: any) {
// TODO: use object update mutation to provide the whole list
- setIsLoading(true);
const { groupids } = data;
const previousIds = objectGroups.map((group: any) => group.id);
const newGroups = groupids.filter((id: string) => !previousIds.includes(id));
- const removedGroups = previousIds.filter((id: string) => !groupids.includes(id));
+
+ const removedGroups = previousIds.filter(
+ (id: string) => !groupids.map((group) => group.id).includes(id)
+ );
try {
if (newGroups.length) {
+ setIsLoading(true);
+
const mutationString = addRelationship({
data: stringifyWithoutQuotes({
id: objectid,
name: "member_of_groups",
- nodes: newGroups.map((id: string) => ({ id })),
+ nodes: newGroups,
}),
});
diff --git a/frontend/src/screens/groups/group-items.tsx b/frontend/src/screens/groups/group-items.tsx
index c700f5285e..0677a8bdee 100644
--- a/frontend/src/screens/groups/group-items.tsx
+++ b/frontend/src/screens/groups/group-items.tsx
@@ -10,10 +10,10 @@ import ModalDelete from "../../components/modals/modal-delete";
import { ALERT_TYPES, Alert } from "../../components/utils/alert";
import { Pagination } from "../../components/utils/pagination";
import { GROUP_OBJECT } from "../../config/constants";
-import { useAuth } from "../../hooks/useAuth";
import graphqlClient from "../../graphql/graphqlClientApollo";
import { deleteObject } from "../../graphql/mutations/objects/deleteObject";
import { getGroups } from "../../graphql/queries/groups/getGroups";
+import { useAuth } from "../../hooks/useAuth";
import usePagination from "../../hooks/usePagination";
import useQuery from "../../hooks/useQuery";
import { useTitle } from "../../hooks/useTitle";
@@ -27,9 +27,9 @@ import { getObjectItemDisplayValue } from "../../utils/getObjectItemDisplayValue
import { getGroupColumns } from "../../utils/getSchemaObjectColumns";
import { getObjectDetailsUrl } from "../../utils/objects";
import { stringifyWithoutQuotes } from "../../utils/string";
-import ErrorScreen from "../error-screen/error-screen";
+import ErrorScreen from "../errors/error-screen";
+import NoDataFound from "../errors/no-data-found";
import LoadingScreen from "../loading-screen/loading-screen";
-import NoDataFound from "../no-data-found/no-data-found";
export default function GroupItems() {
const { groupname } = useParams();
diff --git a/frontend/src/screens/groups/group-relationship.tsx b/frontend/src/screens/groups/group-relationship.tsx
index 779f46bd14..f221223edb 100644
--- a/frontend/src/screens/groups/group-relationship.tsx
+++ b/frontend/src/screens/groups/group-relationship.tsx
@@ -14,6 +14,7 @@ import graphqlClient from "../../graphql/graphqlClientApollo";
import { Icon } from "@iconify-icon/react";
import { useAtomValue } from "jotai/index";
import { removeRelationship } from "../../graphql/mutations/relationships/removeRelationship";
+import { useAuth } from "../../hooks/useAuth";
import UnlinkIcon from "../../images/icons/unlink.svg";
import { currentBranchAtom } from "../../state/atoms/branches.atom";
import { iNodeSchema, schemaState } from "../../state/atoms/schema.atom";
@@ -23,9 +24,8 @@ import { classNames } from "../../utils/common";
import { getObjectItemDisplayValue } from "../../utils/getObjectItemDisplayValue";
import { getObjectDetailsUrl } from "../../utils/objects";
import { stringifyWithoutQuotes } from "../../utils/string";
-import NoDataFound from "../no-data-found/no-data-found";
+import NoDataFound from "../errors/no-data-found";
import ObjectItemEditComponent from "../object-item-edit/object-item-edit-paginated";
-import { useAuth } from "../../hooks/useAuth";
type iRelationDetailsProps = {
parentNode: any;
diff --git a/frontend/src/screens/groups/group-relationships.tsx b/frontend/src/screens/groups/group-relationships.tsx
index f98cae4254..a672cee545 100644
--- a/frontend/src/screens/groups/group-relationships.tsx
+++ b/frontend/src/screens/groups/group-relationships.tsx
@@ -9,7 +9,7 @@ import usePagination from "../../hooks/usePagination";
import useQuery from "../../hooks/useQuery";
import { genericsState, iNodeSchema, schemaState } from "../../state/atoms/schema.atom";
import { getAttributeColumnsFromNodeOrGenericSchema } from "../../utils/getSchemaObjectColumns";
-import ErrorScreen from "../error-screen/error-screen";
+import ErrorScreen from "../errors/error-screen";
import LoadingScreen from "../loading-screen/loading-screen";
import GroupRelationship from "./group-relationship";
diff --git a/frontend/src/screens/homepage.tsx b/frontend/src/screens/homepage.tsx
index 440568bada..f0e10e518c 100644
--- a/frontend/src/screens/homepage.tsx
+++ b/frontend/src/screens/homepage.tsx
@@ -13,14 +13,14 @@ const Homepage = () => {
to="https://docs.infrahub.app/"
target="_blank"
className="text-custom-blue-700 font-semibold">
- developer docs
+ documentation
{" "}
or{" "}
- explore all the ways
+ tutorials
{" "}
to start using Infrahub.
@@ -68,16 +68,16 @@ const Homepage = () => {
+ {icon ||
+ {message ?? DEFAULT_MESSAGE}
+
{prefixData.display_label}
@@ -153,7 +161,7 @@ const IpamIPAddressesList = forwardRef((props, ref) => {
)}
- {loading &&
+
+ );
+};
diff --git a/frontend/src/screens/ipam/ipam-page.tsx b/frontend/src/screens/ipam/ipam-page.tsx
index 32df19bedc..3933efa8ff 100644
--- a/frontend/src/screens/ipam/ipam-page.tsx
+++ b/frontend/src/screens/ipam/ipam-page.tsx
@@ -3,11 +3,14 @@ import { Outlet } from "react-router-dom";
import { Card } from "../../components/ui/card";
import Content from "../layout/content";
import IpamTree from "./ipam-tree/ipam-tree";
+import IpNamespaceSelector from "./ip-namespace-selector";
export default function IpamPage() {
return (
<>
- {renderContent()}
@@ -151,7 +164,14 @@ export default function IpamRouter() {
open={showCreateDrawer}
setOpen={setShowCreateDrawer}>